diff --git a/bluetooth_bcm43xx/Dockerfile b/bluetooth_bcm43xx/Dockerfile
index da9803d..1dc0191 100644
--- a/bluetooth_bcm43xx/Dockerfile
+++ b/bluetooth_bcm43xx/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/check_config/Dockerfile b/check_config/Dockerfile
index b110f62..e17b7ed 100644
--- a/check_config/Dockerfile
+++ b/check_config/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/dhcp_server/Dockerfile b/dhcp_server/Dockerfile
index 44d5c74..924ef43 100644
--- a/dhcp_server/Dockerfile
+++ b/dhcp_server/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/dnsmasq/Dockerfile b/dnsmasq/Dockerfile
index 3904c08..0d22369 100644
--- a/dnsmasq/Dockerfile
+++ b/dnsmasq/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/duckdns/Dockerfile b/duckdns/Dockerfile
index e860e7f..1da64a7 100644
--- a/duckdns/Dockerfile
+++ b/duckdns/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/git_pull/Dockerfile b/git_pull/Dockerfile
index 6063033..f857872 100644
--- a/git_pull/Dockerfile
+++ b/git_pull/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/google_assistant/Dockerfile b/google_assistant/Dockerfile
index e39aa70..cd3393d 100644
--- a/google_assistant/Dockerfile
+++ b/google_assistant/Dockerfile
@@ -1,5 +1,5 @@
-#armhf:FROM multiarch/debian-debootstrap:armhf-stretch
-#amd64:FROM multiarch/debian-debootstrap:amd64-stretch
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Install packages
 RUN apt-get update \
diff --git a/google_assistant/build.json b/google_assistant/build.json
new file mode 100644
index 0000000..73a1107
--- /dev/null
+++ b/google_assistant/build.json
@@ -0,0 +1,6 @@
+{
+  "build_from": {
+    "armhf": "multiarch/debian-debootstrap:armhf-stretch",
+    "amd64": "multiarch/debian-debootstrap:amd64-stretch"  
+  }
+}
diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile
index b9a54d7..a5749c9 100644
--- a/letsencrypt/Dockerfile
+++ b/letsencrypt/Dockerfile
@@ -1,4 +1,5 @@
-FROM %%BASE_IMAGE%%
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # Add env
 ENV LANG C.UTF-8
diff --git a/snips/Dockerfile b/snips/Dockerfile
index c33a4bc..e0dc9ea 100644
--- a/snips/Dockerfile
+++ b/snips/Dockerfile
@@ -1,7 +1,5 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
-#armhf:FROM snipsdocker/platform:arm-0.4.9
-#amd64:FROM snipsdocker/platform:x86-0.4.9
 
 # Copy data
 COPY run.sh /
diff --git a/snips/build.json b/snips/build.json
new file mode 100644
index 0000000..c5c2ec1
--- /dev/null
+++ b/snips/build.json
@@ -0,0 +1,6 @@
+{
+  "build_from": {
+    "armhf": "snipsdocker/platform:arm-0.4.9",
+    "amd64": "snipsdocker/platform:x86-0.4.9"
+  }
+}