diff --git a/codepot/configure.ac b/codepot/configure.ac
index c7cb60b7..c9c0bba0 100644
--- a/codepot/configure.ac
+++ b/codepot/configure.ac
@@ -118,6 +118,10 @@ AC_CONFIG_FILES([
 	DEBIAN/control
 	DEBIAN/postinst
 	DEBIAN/postrm
+
+	docker/Makefile
+
+	src/Makefile
 	src/config.php
 	src/codepot/config/Makefile
 	src/codepot/controllers/Makefile
@@ -163,7 +167,6 @@ AC_CONFIG_FILES([
 	src/system/database/Makefile
 	src/system/Makefile
 
-	src/Makefile
 ])
 AC_OUTPUT
 
diff --git a/codepot/docker/Makefile b/codepot/docker/Makefile.am
similarity index 66%
rename from codepot/docker/Makefile
rename to codepot/docker/Makefile.am
index 4e611a88..bfdc9ef6 100644
--- a/codepot/docker/Makefile
+++ b/codepot/docker/Makefile.am
@@ -2,8 +2,12 @@ all:
 	@echo "Choose one of the following targets:"
 	@echo "  rocky84 ubnt2004"
 
-ubnt2004:
+ubnt2004: codepot-$(VERSION):
 	docker build -t codepot:ubnt20.04 -f Dockerfile.ubnt2004 .
 
-rocky84:
+rocky84: codepot-$(VERSION):
 	docker build -t codepot:rocky8.4 -f Dockerfile.rocky84 .
+
+codepot-$(VERSION):
+	cd .. && make dist
+