diff --git a/Dockerfile b/Dockerfile
index 8fc0f5b..3033000 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,31 @@
 ARG BASE_IMAGE
 
-FROM python:$BASE_IMAGE as developement
+FROM python:$BASE_IMAGE as dev
 WORKDIR /code
-ENV HOME=/code
 COPY requirements.txt .
 RUN mkdir secrets assets\
- && apk add --no-cache \
+ && apk add --no-cache\
     gnupg\
     openssl\
     make\
- && pip3 install -r requirements.txt\
- && adduser -D vaultify\
- && chown vaultify .
+ && pip3 install -r requirements.txt
 COPY ./Makefile Makefile
 COPY ./vaultify vaultify
-COPY .vaultify.yml ./vaultify.yml
+COPY .vaultify.yml .vaultify.yml
 COPY ./entry.py entry.py
 COPY ./setup.py setup.py
 COPY ./tests tests
 COPY ./runtests.py runtests.py
 RUN make run/tests
 RUN make artifact/pkg
-USER vaultify
-ENTRYPOINT ["python3"]
-CMD ["/code/entry.py", "{*}"]
+ENTRYPOINT ["/bin/ash"]
 
-FROM python:$BASE_IMAGE as production
+FROM python:$BASE_IMAGE as prod
 WORKDIR /code
 COPY --from=0 /code/dist/vaultify*.whl /code/
 COPY --from=0 /code/requirements.txt .
 RUN mkdir secrets assets\
- && apk add --no-cache \
+ && apk add --no-cache\
     gnupg\
     openssl\
  && pip3 install -r requirements.txt\
diff --git a/Makefile b/Makefile
index 296de14..29bd103 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGET := production
+TARGET ?= prod
 BASE_IMAGE := 3.7-alpine3.7
 HEAD ?= $(shell git rev-parse --short HEAD)
 TAG ?= $(shell git describe --abbrev=0 --tags)
diff --git a/assets/secrets.plain b/assets/secrets.plain
deleted file mode 100644
index c54be83..0000000
--- a/assets/secrets.plain
+++ /dev/null
@@ -1,5 +0,0 @@
-# comment are a pain
-K1=V1 # so painful
-
-K2=V2
-# omigod
diff --git a/vaultify/config.py b/vaultify/config.py
index e12327a..4176c4d 100644
--- a/vaultify/config.py
+++ b/vaultify/config.py
@@ -7,7 +7,7 @@
 MODULE_BASE_DIR = os.path.dirname(
     os.path.realpath(__file__))
 ETC_DEFAULT_CONFIG = '/etc/default/vaultify.yml'
-USER_CONFIG = '{}/.vaultify.yml'.format(os.environ.get("HOME", '.'))
+USER_CONFIG = '{}/.vaultify.yml'.format(os.environ.get("HOME"))
 LOCAL_CONFIG = '{}/.vaultify.yml'.format(os.environ.get("PWD", '.'))
 
 CFG_DEFAULT_FILES = [