diff --git a/linux/ecosystem/perforce/base/r16.2/Makefile b/linux/ecosystem/perforce/base/r16.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r16.2/Makefile
+++ b/linux/ecosystem/perforce/base/r16.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r17.1/Makefile b/linux/ecosystem/perforce/base/r17.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r17.1/Makefile
+++ b/linux/ecosystem/perforce/base/r17.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r17.2/Makefile b/linux/ecosystem/perforce/base/r17.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r17.2/Makefile
+++ b/linux/ecosystem/perforce/base/r17.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r18.1/Makefile b/linux/ecosystem/perforce/base/r18.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r18.1/Makefile
+++ b/linux/ecosystem/perforce/base/r18.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r18.2/Makefile b/linux/ecosystem/perforce/base/r18.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r18.2/Makefile
+++ b/linux/ecosystem/perforce/base/r18.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r19.1/Makefile b/linux/ecosystem/perforce/base/r19.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r19.1/Makefile
+++ b/linux/ecosystem/perforce/base/r19.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r19.2/Makefile b/linux/ecosystem/perforce/base/r19.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r19.2/Makefile
+++ b/linux/ecosystem/perforce/base/r19.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r20.1/Makefile b/linux/ecosystem/perforce/base/r20.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r20.1/Makefile
+++ b/linux/ecosystem/perforce/base/r20.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r20.2/Makefile b/linux/ecosystem/perforce/base/r20.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r20.2/Makefile
+++ b/linux/ecosystem/perforce/base/r20.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r21.1/Makefile b/linux/ecosystem/perforce/base/r21.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r21.1/Makefile
+++ b/linux/ecosystem/perforce/base/r21.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r21.2/Makefile b/linux/ecosystem/perforce/base/r21.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r21.2/Makefile
+++ b/linux/ecosystem/perforce/base/r21.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r22.1/Makefile b/linux/ecosystem/perforce/base/r22.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r22.1/Makefile
+++ b/linux/ecosystem/perforce/base/r22.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r23.1/Makefile b/linux/ecosystem/perforce/base/r23.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r23.1/Makefile
+++ b/linux/ecosystem/perforce/base/r23.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r23.2/Makefile b/linux/ecosystem/perforce/base/r23.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r23.2/Makefile
+++ b/linux/ecosystem/perforce/base/r23.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r24.1/Makefile b/linux/ecosystem/perforce/base/r24.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r24.1/Makefile
+++ b/linux/ecosystem/perforce/base/r24.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/base/r24.2/Makefile b/linux/ecosystem/perforce/base/r24.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/base/r24.2/Makefile
+++ b/linux/ecosystem/perforce/base/r24.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r16.2/Makefile b/linux/ecosystem/perforce/p4p/r16.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r16.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r16.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r17.1/Makefile b/linux/ecosystem/perforce/p4p/r17.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r17.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r17.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r17.2/Makefile b/linux/ecosystem/perforce/p4p/r17.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r17.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r17.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r18.1/Makefile b/linux/ecosystem/perforce/p4p/r18.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r18.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r18.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r18.2/Makefile b/linux/ecosystem/perforce/p4p/r18.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r18.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r18.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r19.1/Makefile b/linux/ecosystem/perforce/p4p/r19.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r19.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r19.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r19.2/Makefile b/linux/ecosystem/perforce/p4p/r19.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r19.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r19.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r20.1/Makefile b/linux/ecosystem/perforce/p4p/r20.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r20.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r20.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r20.2/Makefile b/linux/ecosystem/perforce/p4p/r20.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r20.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r20.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r21.1/Makefile b/linux/ecosystem/perforce/p4p/r21.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r21.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r21.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r21.2/Makefile b/linux/ecosystem/perforce/p4p/r21.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r21.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r21.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r22.1/Makefile b/linux/ecosystem/perforce/p4p/r22.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r22.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r22.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r23.1/Makefile b/linux/ecosystem/perforce/p4p/r23.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r23.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r23.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r23.2/Makefile b/linux/ecosystem/perforce/p4p/r23.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r23.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r23.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r24.1/Makefile b/linux/ecosystem/perforce/p4p/r24.1/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r24.1/Makefile
+++ b/linux/ecosystem/perforce/p4p/r24.1/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy
diff --git a/linux/ecosystem/perforce/p4p/r24.2/Makefile b/linux/ecosystem/perforce/p4p/r24.2/Makefile
index 1e4371492..ff56425bb 100644
--- a/linux/ecosystem/perforce/p4p/r24.2/Makefile
+++ b/linux/ecosystem/perforce/p4p/r24.2/Makefile
@@ -13,7 +13,7 @@ deploy:
 	make deploy-buildah
 
 build-buildah:
-	buildah-wrapper --build
+	buildah-wrapper --build --squash
 
 deploy-buildah:
 	buildah-wrapper --deploy