diff --git a/.gitignore b/.gitignore
index c2f3501..70c1cbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *build/
+.idea/
\ No newline at end of file
diff --git a/debian-isogen/Dockerfile b/debian-isogen/Dockerfile
index 90a4894..667b919 100644
--- a/debian-isogen/Dockerfile
+++ b/debian-isogen/Dockerfile
@@ -39,3 +39,9 @@ RUN curl -L https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd
     && chmod +x /bin/yq
 
 CMD /bin/bash /builder/build.sh
+
+RUN useradd airship --create-home --shell=/bin/bash
+
+USER airship
+
+WORKDIR /home/airship/
\ No newline at end of file
diff --git a/ipa-downloader-image/Dockerfile b/ipa-downloader-image/Dockerfile
index a8a2212..8bc79bf 100644
--- a/ipa-downloader-image/Dockerfile
+++ b/ipa-downloader-image/Dockerfile
@@ -14,3 +14,9 @@ RUN set -ex ;\
 FROM ubuntu:18.04 as dist
 
 COPY --from=downloader /tmp/ironic-python-agent /
+
+RUN useradd airship --create-home --shell=/bin/bash
+
+USER airship
+
+WORKDIR /home/airship/
\ No newline at end of file