diff --git a/docker/thingsboard-db-schema/Makefile b/docker/thingsboard-db-schema/Makefile
index ef526e1a6a..604520e90d 100644
--- a/docker/thingsboard-db-schema/Makefile
+++ b/docker/thingsboard-db-schema/Makefile
@@ -7,7 +7,7 @@ build:
 	cp ../../dao/src/main/resources/demo-data.cql .
 	cp ../../dao/src/main/resources/system-data.cql .
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+	rm schema.cql demo-data.cql system-data.cql
 
 push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
-	rm schema.cql demo-data.cql system-data.cql
\ No newline at end of file
+	docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file
diff --git a/docker/thingsboard/Makefile b/docker/thingsboard/Makefile
index 72ada4d0f7..000968e447 100644
--- a/docker/thingsboard/Makefile
+++ b/docker/thingsboard/Makefile
@@ -5,7 +5,7 @@ APP=application
 build:
 	cp ../../application/target/thingsboard.deb .
 	docker build --pull -t ${PROJECT}/${APP}:${VERSION} .
+	rm thingsboard.deb
 
 push: build
-	docker push ${PROJECT}/${APP}:${VERSION}
-	rm thingsboard.deb
\ No newline at end of file
+	docker push ${PROJECT}/${APP}:${VERSION}
\ No newline at end of file