diff --git a/3.7-amd64-builder/Dockerfile b/3.7-amd64-builder/Dockerfile
index 6fd7120..b22e1e1 100644
--- a/3.7-amd64-builder/Dockerfile
+++ b/3.7-amd64-builder/Dockerfile
@@ -3,6 +3,11 @@
 
 FROM sepen/crux:3.7-amd64-core
 
-RUN ports -u && prt-get depinst fakeroot git
+RUN ports -u opt && \
+    cd /usr/ports/opt/fakeroot && \
+    pkgmk -d && pkgadd *.pkg.tar.* && \
+    cd /usr/ports/opt/git && \
+    pkgmk -d && pkgadd *.pkg.tar.* && \
+    rm -rf /usr/ports/*
 
 CMD /usr/bin/crux
diff --git a/3.7-arm64-builder/Dockerfile b/3.7-arm64-builder/Dockerfile
index 66ba8e6..9e4d033 100644
--- a/3.7-arm64-builder/Dockerfile
+++ b/3.7-arm64-builder/Dockerfile
@@ -1,8 +1,13 @@
 # 3.7-arm64-builder
 # Builder variant with necessary packages to build ports and clone git repositories
 
-FROM sepen/crux:3.7-arm64-core as builder
+FROM sepen/crux:3.7-arm64-core
 
-RUN ports -u && prt-get depinst fakeroot git
+RUN ports -u opt && \
+    cd /usr/ports/opt/fakeroot && \
+    pkgmk -d && pkgadd *.pkg.tar.* && \
+    cd /usr/ports/opt/git && \
+    pkgmk -d && pkgadd *.pkg.tar.* && \
+    rm -rf /usr/ports/*
 
 CMD /usr/bin/crux
\ No newline at end of file
diff --git a/3.7-armhf-builder/Dockerfile b/3.7-armhf-builder/Dockerfile
index 895cab2..7e67e22 100644
--- a/3.7-armhf-builder/Dockerfile
+++ b/3.7-armhf-builder/Dockerfile
@@ -1,8 +1,13 @@
 # 3.7-armhf-builder
 # Builder variant with necessary packages to build ports and clone git repositories
 
-FROM sepen/crux:3.7-armhf-core as builder
+FROM sepen/crux:3.7-armhf-core
 
-RUN ports -u && prt-get depinst fakeroot git
+RUN ports -u opt && \
+    cd /usr/ports/opt/fakeroot && \
+    pkgmk -d && pkgadd *.pkg.tar.* && \
+    cd /usr/ports/opt/git && \
+    pkgmk -d && pkgadd *.pkg.tar.* && \
+    rm -rf /usr/ports/*
 
 CMD /usr/bin/crux
\ No newline at end of file