diff --git a/compose/mac_win.yml b/compose/mac_win.yml
index 579af657..d187971e 100644
--- a/compose/mac_win.yml
+++ b/compose/mac_win.yml
@@ -35,7 +35,6 @@ services:
 # T-Pot Init Service
   tpotinit:
     container_name: tpotinit
-    build: docker/.
     env_file:
      - .env
     restart: always
diff --git a/compose/standard.yml b/compose/standard.yml
index c5e7e8c4..0e71767b 100644
--- a/compose/standard.yml
+++ b/compose/standard.yml
@@ -34,7 +34,6 @@ services:
 # T-Pot Init Service
   tpotinit:
     container_name: tpotinit
-    build: docker/.
     env_file:
       - .env
     restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index c5e7e8c4..0e71767b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,6 @@ services:
 # T-Pot Init Service
   tpotinit:
     container_name: tpotinit
-    build: docker/.
     env_file:
       - .env
     restart: always
diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml
index 25fc70ff..b704c07b 100644
--- a/installer/install/tpot.yml
+++ b/installer/install/tpot.yml
@@ -334,22 +334,6 @@
         - "Fedora"
         - "openSUSE Tumbleweed"
 
-    - name: Get Firewall rules (Fedora, openSUSE Tumbleweed)
-      command: "firewall-cmd --list-all"
-      register: firewall_output
-      when: ansible_distribution in ["Fedora", "openSUSE Tumbleweed"]
-      tags:
-        - "Fedora"
-        - "openSUSE Tumbleweed"
-
-    - name: Print Firewall rules (Fedora, openSUSE Tumbleweed)
-      debug:
-        var: firewall_output.stdout_lines
-      when: ansible_distribution in ["Fedora", "openSUSE Tumbleweed"]
-      tags:
-        - "Fedora"
-        - "openSUSE Tumbleweed"
-
     - name: Load kernel modules (Fedora)
       command: modprobe -v iptable_filter
       when: ansible_distribution in ["Fedora"]
@@ -422,6 +406,22 @@
         - "Fedora"
         - "openSUSE Tumbleweed"
 
+    - name: Get Firewall rules (Fedora, openSUSE Tumbleweed)
+      command: "firewall-cmd --list-all"
+      register: firewall_output
+      when: ansible_distribution in ["Fedora", "openSUSE Tumbleweed"]
+      tags:
+        - "Fedora"
+        - "openSUSE Tumbleweed"
+
+    - name: Print Firewall rules (Fedora, openSUSE Tumbleweed)
+      debug:
+        var: firewall_output.stdout_lines
+      when: ansible_distribution in ["Fedora", "openSUSE Tumbleweed"]
+      tags:
+        - "Fedora"
+        - "openSUSE Tumbleweed"
+
     - name: Enable Docker Engine upon boot (All)
       service:
         name: docker