diff --git a/fantom/opera/fantom-mainnet-opera-archive-trace.yml b/fantom/opera/fantom-mainnet-opera-archive-trace.yml
index cdafbc1e..95084906 100644
--- a/fantom/opera/fantom-mainnet-opera-archive-trace.yml
+++ b/fantom/opera/fantom-mainnet-opera-archive-trace.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-mainnet-archive:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: release/txtracing/1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: release/txtracing/1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10897:10897
diff --git a/fantom/opera/fantom-mainnet-opera-archive.yml b/fantom/opera/fantom-mainnet-opera-archive.yml
index 5fbe46e0..a16e7828 100644
--- a/fantom/opera/fantom-mainnet-opera-archive.yml
+++ b/fantom/opera/fantom-mainnet-opera-archive.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-mainnet-archive:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: v1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: v1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10897:10897
diff --git a/fantom/opera/fantom-mainnet-opera-pruned-trace.yml b/fantom/opera/fantom-mainnet-opera-pruned-trace.yml
index bd5eae1b..db5cd641 100644
--- a/fantom/opera/fantom-mainnet-opera-pruned-trace.yml
+++ b/fantom/opera/fantom-mainnet-opera-pruned-trace.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-mainnet:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: release/txtracing/1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: release/txtracing/1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10897:10897
diff --git a/fantom/opera/fantom-mainnet-opera-pruned.yml b/fantom/opera/fantom-mainnet-opera-pruned.yml
index 6cf556c4..b29179b4 100644
--- a/fantom/opera/fantom-mainnet-opera-pruned.yml
+++ b/fantom/opera/fantom-mainnet-opera-pruned.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-mainnet:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: v1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: v1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10897:10897
diff --git a/fantom/opera/fantom-testnet-opera-archive-trace.yml b/fantom/opera/fantom-testnet-opera-archive-trace.yml
index f53b1041..7a691c63 100644
--- a/fantom/opera/fantom-testnet-opera-archive-trace.yml
+++ b/fantom/opera/fantom-testnet-opera-archive-trace.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-testnet-archive:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: release/txtracing/1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: release/txtracing/1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10196:10196
diff --git a/fantom/opera/fantom-testnet-opera-archive.yml b/fantom/opera/fantom-testnet-opera-archive.yml
index 31bb7fef..f51eae5c 100644
--- a/fantom/opera/fantom-testnet-opera-archive.yml
+++ b/fantom/opera/fantom-testnet-opera-archive.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-testnet-archive:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: v1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: v1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10196:10196
diff --git a/fantom/opera/fantom-testnet-opera-pruned-trace.yml b/fantom/opera/fantom-testnet-opera-pruned-trace.yml
index 095f35e6..4b38b783 100644
--- a/fantom/opera/fantom-testnet-opera-pruned-trace.yml
+++ b/fantom/opera/fantom-testnet-opera-pruned-trace.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-testnet:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: release/txtracing/1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: release/txtracing/1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10196:10196
diff --git a/fantom/opera/fantom-testnet-opera-pruned.yml b/fantom/opera/fantom-testnet-opera-pruned.yml
index 6ed764b7..8c6b039b 100644
--- a/fantom/opera/fantom-testnet-opera-pruned.yml
+++ b/fantom/opera/fantom-testnet-opera-pruned.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-testnet:
+    build:
+      context: ./fantom
+      dockerfile: opera.Dockerfile
+      args:
+        VERSION: v1.1.3-rc.5
+        REPO: https://github.com/Fantom-foundation/go-opera.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: opera.Dockerfile
-      args:
-        VERSION: v1.1.3-rc.5
-        REPO: https://github.com/Fantom-foundation/go-opera.git
     user: root
     ports:
       - 10196:10196
diff --git a/fantom/sonic/fantom-mainnet-sonic-archive.yml b/fantom/sonic/fantom-mainnet-sonic-archive.yml
index 94d92257..a226a069 100644
--- a/fantom/sonic/fantom-mainnet-sonic-archive.yml
+++ b/fantom/sonic/fantom-mainnet-sonic-archive.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-mainnet-archive:
+    build:
+      context: ./fantom
+      dockerfile: sonic.Dockerfile
+      args:
+        VERSION: v1.2.1-h
+        REPO: https://github.com/Fantom-foundation/sonic.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: sonic.Dockerfile
-      args:
-        VERSION: v1.2.1-h
-        REPO: https://github.com/Fantom-foundation/sonic.git
     user: root
     ports:
       - 10335:10335
diff --git a/fantom/sonic/fantom-testnet-sonic-archive.yml b/fantom/sonic/fantom-testnet-sonic-archive.yml
index fa323fb3..51cff9e4 100644
--- a/fantom/sonic/fantom-testnet-sonic-archive.yml
+++ b/fantom/sonic/fantom-testnet-sonic-archive.yml
@@ -3,6 +3,12 @@
 
 services:
   fantom-testnet-archive:
+    build:
+      context: ./fantom
+      dockerfile: sonic.Dockerfile
+      args:
+        VERSION: v1.2.1-h
+        REPO: https://github.com/Fantom-foundation/sonic.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./fantom
-      dockerfile: sonic.Dockerfile
-      args:
-        VERSION: v1.2.1-h
-        REPO: https://github.com/Fantom-foundation/sonic.git
     user: root
     ports:
       - 10652:10652
diff --git a/sonic/sonic/sonic-mainnet-sonic-archive.yml b/sonic/sonic/sonic-mainnet-sonic-archive.yml
index 1a3718d9..fffabb89 100644
--- a/sonic/sonic/sonic-mainnet-sonic-archive.yml
+++ b/sonic/sonic/sonic-mainnet-sonic-archive.yml
@@ -3,6 +3,12 @@
 
 services:
   sonic-mainnet-archive:
+    build:
+      context: ./sonic
+      dockerfile: sonic.Dockerfile
+      args:
+        VERSION: v2.0.3
+        REPO: https://github.com/0xsoniclabs/sonic.git
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -16,12 +22,6 @@ services:
       net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
     ulimits:
       nofile: 1048576    # Max open files (for RPC/WS connections)
-    build:
-      context: ./sonic
-      dockerfile: sonic.Dockerfile
-      args:
-        VERSION: v2.0.3
-        REPO: https://github.com/0xsoniclabs/sonic.git
     user: root
     ports:
       - 10658:10658