diff --git a/Makefile b/Makefile
index 23b5dee..561f024 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,12 @@
-BUILD_TAG ?= latest
+BUILD_TAG = $(shell date +'%Y.%m.%d')
+IMAGE ?= packager
 
+build:
+	echo "Building franky-$(IMAGE) with tag $(BUILD_TAG)"
+	podman build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/.
+	podman image tag liliesh/franky-$(IMAGE):$(BUILD_TAG) liliesh/franky-$(IMAGE):latest
 
-build: build-latest build-version
-publish: publish-generic publish-packager
-
-build-generic:
-	podman build -t liliesh/franky:$(BUILD_TAG) .
-
-build-packager:
-	podman build -t liliesh/franky-packager:$(BUILD_TAG) packager/.
-
-
-publish: publish-latest publish-version
-publish-generic:
-	podman push localhost/liliesh/franky:$(BUILD_TAG) registry.satecloud.com/liliesh/franky:$(BUILD_TAG)
-
-publish-packager:
-	podman push localhost/liliesh/franky-packager:$(BUILD_TAG) registry.satecloud.com/liliesh/franky-packager:$(BUILD_TAG)
+publish:
+	podman build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/.
+	podman push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) registry.satecloud.com/liliesh/franky-$(IMAGE):$(BUILD_TAG)
+	podman push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) registry.satecloud.com/liliesh/franky-$(IMAGE):latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..ce1bf68
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:3.20.1
+
+# Install base
+RUN apk add --no-cache docker docker-compose bash
+CMD [ "/bin/bash" ]
\ No newline at end of file
diff --git a/Dockerfile b/rust/Dockerfile
similarity index 94%
rename from Dockerfile
rename to rust/Dockerfile
index 60b6bae..56bd259 100644
--- a/Dockerfile
+++ b/rust/Dockerfile
@@ -11,4 +11,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 ENV PATH="/root/.cargo/bin:$PATH"
 
-CMD [ "/bin/bash" ]
\ No newline at end of file
+CMD [ "/bin/bash" ]