diff --git a/docker-compose.yml b/docker-compose.yml
index d5f195e..8f018fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,7 @@ services:
     - VIRTUAL_PROTO=https
     - VIRTUAL_PORT=443
     - VIRTUAL_HOST=${FREEIPA_HOST}
-    - PASSWORD={FREEIPA_PASS}
+    # - PASSWORD=${FREEIPA_PASS}
     # - HTTPS_METHOD=noredirect
     # - USE_LETSENCRYPT_CERTS=${USE_LETSENCRYPT_CERTS}
     # - LETSENCRYPT_HOST=${FREEIPA_HOST}
diff --git a/first_run.sh b/first_run.sh
index cc505c1..0ac4a9d 100755
--- a/first_run.sh
+++ b/first_run.sh
@@ -1,9 +1,10 @@
 #!/bin/bash
 source .env
 
-# [ -f ${SERVICE_DATA}/ipa-server-install-options ] && {
-#     echo ${SERVICE_DATA}/ipa-server-install-options
-# }
+[ -f ${SERVICE_DATA}/ipa-server-install-options ] && {
+    echo "--password=${FREEIPA_PASS}" > ${SERVICE_DATA}/ipa-server-install-options
+    echo "--admin-password=${FREEIPA_PASS}" >> ${SERVICE_DATA}/ipa-server-install-options
+}
 
 docker-compose run --rm --service-ports freeipa exit-on-finished