diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c6eecef
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+BUILD_TAG = $(shell date +'%Y.%m.%d')
+IMAGE ?= packager
+REGISTRY=registry.pinkhaj.world
+ENGINE=podman
+
+build:
+	echo "Building franky-$(IMAGE) with tag $(BUILD_TAG)"
+	$(ENGINE) build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/.
+	$(ENGINE) image tag liliesh/franky-$(IMAGE):$(BUILD_TAG) liliesh/franky-$(IMAGE):latest
+
+publish:
+	$(ENGINE) build -t liliesh/franky-$(IMAGE):$(BUILD_TAG) $(IMAGE)/.
+	$(ENGINE) push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) $(REGISTRY)/liliesh/franky-$(IMAGE):$(BUILD_TAG)
+	$(ENGINE) push localhost/liliesh/franky-$(IMAGE):$(BUILD_TAG) $(REGISTRY)/liliesh/franky-$(IMAGE):latest
diff --git a/commander/Dockerfile b/commander/Dockerfile
new file mode 100644
index 0000000..69b89fd
--- /dev/null
+++ b/commander/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine:3.20.1
+
+# Install base
+RUN apk add --no-cache --upgrade grep
+RUN apk add --no-cache bash git openssh
+CMD [ "/bin/bash" ]
\ No newline at end of file
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/packager/Dockerfile b/packager/Dockerfile
new file mode 100644
index 0000000..8e0dc80
--- /dev/null
+++ b/packager/Dockerfile
@@ -0,0 +1,8 @@
+FROM rockylinux:9.3
+
+# Install base
+RUN dnf install -y rpmdevtools rpmlint epel-release
+RUN dnf group install -y "Development Tools"
+RUN dnf install -y dpkg
+
+CMD [ "/bin/bash" ]
\ No newline at end of file
diff --git a/rust/Dockerfile b/rust/Dockerfile
new file mode 100644
index 0000000..56bd259
--- /dev/null
+++ b/rust/Dockerfile
@@ -0,0 +1,14 @@
+FROM rockylinux:9.3
+
+# Install base
+RUN dnf install -y rpmdevtools rpmlint epel-release
+RUN dnf group install -y "Development Tools"
+RUN dnf install -y dpkg
+
+# Install lang specifics
+RUN dnf install -y rust cargo
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+ENV PATH="/root/.cargo/bin:$PATH"
+
+CMD [ "/bin/bash" ]