diff --git a/Earthfile b/Earthfile
index 7162458..a212b94 100644
--- a/Earthfile
+++ b/Earthfile
@@ -223,6 +223,13 @@ base-image:
         ARG BASE_K8S_VERSION=$K8S_VERSION-$K8S_DISTRIBUTION_TAG
     END
 
+    IF $TWO_NODE
+        RUN mkdir -p /opt/spectrocloud/bin && \
+        curl -sL https://github.com/maxpert/marmot/releases/download/v"${MARMOT_VERSION}"/marmot-v"${MARMOT_VERSION}"-linux-amd64-static.tar.gz | tar -zxv marmot && \
+        install marmot -o root -g root -m 755 /opt/spectrocloud/bin/ && \
+        rm -f marmot
+    END
+
     IF [ "$OS_DISTRIBUTION" = "ubuntu" ] &&  [ "$ARCH" = "amd64" ]
         RUN apt update && \
             apt install --no-install-recommends zstd vim -y
@@ -249,12 +256,7 @@ base-image:
         RUN rm -rf /var/cache/* && \
             apt clean
 
-        # TODO: handle installation for opensuse
         IF $TWO_NODE
-            RUN mkdir -p /opt/spectrocloud/bin && \
-                curl -sL https://github.com/maxpert/marmot/releases/download/v"${MARMOT_VERSION}"/marmot-v"${MARMOT_VERSION}"-linux-amd64-static.tar.gz | tar -zxv marmot && \
-                install marmot -o root -g root -m 755 /opt/spectrocloud/bin/ && \
-                rm -f marmot
             RUN apt install -y sqlite3
         END
             
@@ -275,10 +277,6 @@ base-image:
             # zypper purge-kernels && \
 
         IF $TWO_NODE
-            RUN mkdir -p /opt/spectrocloud/bin && \
-                curl -sL https://github.com/maxpert/marmot/releases/download/v"${MARMOT_VERSION}"/marmot-v"${MARMOT_VERSION}"-linux-amd64-static.tar.gz | tar -zxv marmot && \
-                install marmot -o root -g root -m 755 /opt/spectrocloud/bin/ && \
-                rm -f marmot
             RUN zypper install -y sqlite3
         END
         RUN zypper install -y zstd vim