diff --git a/codepot/Makefile.am b/codepot/Makefile.am
index a7017379..8557020a 100644
--- a/codepot/Makefile.am
+++ b/codepot/Makefile.am
@@ -1,9 +1,9 @@
 ACLOCAL_AMFLAGS = -I ac/m4
 AUTOMAKE_OPTION = foreign
 
-SUBDIRS = etc src sbin pecl-svn
+SUBDIRS = etc src sbin pecl-svn 
 
-EXTRA_DIST = README.md mkmf.sh DEBIAN
+EXTRA_DIST = README.md mkmf.sh DEBIAN docker
 
 PHP_PACKAGE_NAME ?= php
 
diff --git a/codepot/Makefile.in b/codepot/Makefile.in
index ec3f94a4..ee4accca 100644
--- a/codepot/Makefile.in
+++ b/codepot/Makefile.in
@@ -306,8 +306,8 @@ top_srcdir = @top_srcdir@
 wwwdir = @wwwdir@
 ACLOCAL_AMFLAGS = -I ac/m4
 AUTOMAKE_OPTION = foreign
-SUBDIRS = etc src sbin pecl-svn
-EXTRA_DIST = README.md mkmf.sh DEBIAN
+SUBDIRS = etc src sbin pecl-svn 
+EXTRA_DIST = README.md mkmf.sh DEBIAN docker
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/codepot/docker/Makefile.am b/codepot/docker/Makefile.am
index da63345b..9ab33a6d 100644
--- a/codepot/docker/Makefile.am
+++ b/codepot/docker/Makefile.am
@@ -4,9 +4,11 @@ all:
 
 ubnt2004: @srcdir@/codepot-@VERSION@.tar.gz
 	docker build -t codepot:ubnt20.04 -f @srcdir/Dockerfile.ubnt2004 @srcdir@
+	rm -f @srcdir@/codepot-@VERSION@.tar.gz
 
 rocky84: @srcdir@/codepot-@VERSION@.tar.gz
 	docker build -t codepot:rocky8.4 -f @srcdir@/Dockerfile.rocky84 @srcdir@
+	rm -f @srcdir@/codepot-@VERSION@.tar.gz
 
 @srcdir@/codepot-@VERSION@.tar.gz:
 	cd .. && make dist
diff --git a/codepot/docker/Makefile.in b/codepot/docker/Makefile.in
index 0e1bece6..703613af 100644
--- a/codepot/docker/Makefile.in
+++ b/codepot/docker/Makefile.in
@@ -413,9 +413,11 @@ all:
 
 ubnt2004: @srcdir@/codepot-@VERSION@.tar.gz
 	docker build -t codepot:ubnt20.04 -f @srcdir/Dockerfile.ubnt2004 @srcdir@
+	rm -f @srcdir@/codepot-@VERSION@.tar.gz
 
 rocky84: @srcdir@/codepot-@VERSION@.tar.gz
 	docker build -t codepot:rocky8.4 -f @srcdir@/Dockerfile.rocky84 @srcdir@
+	rm -f @srcdir@/codepot-@VERSION@.tar.gz
 
 @srcdir@/codepot-@VERSION@.tar.gz:
 	cd .. && make dist