diff --git a/Containerfile b/Containerfile
index 2c5e4ca..1065ba2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -41,9 +41,6 @@ ADD home.tar.gz $DEV_HOME
 RUN mkdir -p $DEV_HOME/.ssh && \
   ssh-keyscan -p 2222 10.88.0.1 >> $DEV_HOME/.ssh/known_hosts && \
   ssh-keyscan -p 22 github.com >> $DEV_HOME/.ssh/known_hosts && \
-  podman system connection add my-remote --identity $DEV_HOME/.ssh/id_ed25519 \
-  ssh://$POD_USER@10.88.0.1/run/user/${POD_UID}/podman/podman.sock && \
-  podman system connection set-default my-remote && \
   for d in $DEV_HOME/.local \
   $DEV_HOME/.config/fish/completions \
   $DEV_HOME/.config/fish/functions \
@@ -61,4 +58,8 @@ RUN mkdir -p $DEV_HOME/.ssh && \
 WORKDIR /app
 USER $DEV_USER
 
+RUN  podman system connection add my-remote --identity $DEV_HOME/.ssh/id_ed25519 \
+  ssh://$POD_USER@10.88.0.1/run/user/${POD_UID}/podman/podman.sock && \
+  podman system connection default my-remote
+
 CMD ["/home/devuser/start.sh"]