diff --git a/.gitignore b/.gitignore
index 89a377c67a2bd481600cb128879ad950be684a9b..8c723dbc300851c01c11c71711b051f8a0830ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 *.iml
 config/*.conf
+config/*.users
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8c28e2105a96780311bb3125727b3781755b85a..c7bb40d88a15c96f9869f69f2d5ce9493f86468f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,8 +25,7 @@ lint:shell-script:
   before_script:
     - shellcheck -V
   script:
-#    - shellcheck ./context/s3-purge.sh
-    - exit 0
+    - shellcheck ./context/entrypoint
 
 #
 # IMAGE BUILDS/PUSHES
@@ -41,18 +40,10 @@ build:master:
     - master
   when: manual
 
-build:dev-amd64:
+build:dev:
   stage: deploy
   script:
-    - docker build --build-arg opts="CGO_ENABLED=0 GOARCH=amd64" --pull -t "$CI_REGISTRY_IMAGE:dev-amd64" ./context/
-#    - docker push "$CI_REGISTRY_IMAGE:dev-amd64"
-  except:
-    - master
-
-build:dev-arm7:
-  stage: deploy
-  script:
-    - docker build --build-arg opts="GOARCH=arm GOARM=7" --pull -t "$CI_REGISTRY_IMAGE:dev-arm7" ./context/
-  #    - docker push "$CI_REGISTRY_IMAGE:dev-arm7"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" ./context/
+#    - docker push "$CI_REGISTRY_IMAGE:dev"
   except:
     - master
diff --git a/context/Dockerfile b/context/Dockerfile
index 9091a3e93bba80869d8e53cc39a56272bc7bc199..221b3cc503e9e0174ecc38239e0dc3d7459e4635 100644
--- a/context/Dockerfile
+++ b/context/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# TODO: entrypoint?
-
 EXPOSE 3493
+
+COPY entrypoint /usr/local/bin/
+ENTRYPOINT ["entrypoint"]
diff --git a/context/entrypoint b/context/entrypoint
new file mode 100755
index 0000000000000000000000000000000000000000..75947d1d87d802cdd25fc9233e6be2cb0c1f0f70
--- /dev/null
+++ b/context/entrypoint
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+CONFIG_SOURCE="/opt/nut-config"
+export CONFIG_SOURCE
+
+CONFIG_DEST="/etc/nut"
+export CONFIG_DEST
+
+echo "Copying configurations from ${CONFIG_SOURCE} to ${CONFIG_DEST}..."
+
+find $CONFIG_SOURCE -name "*.conf" -exec cp '{}' $CONFIG_DEST \;
+
+echo "Restarting services..."
+
+upsdrvctl start
+/etc/init.d/nut-server restart
+
+echo "Ready on port 3493"
+tail -F /dev/null
diff --git a/docker-compose.yml b/docker-compose.yml
index a32bbfb48efcd59033d5401a1483740eb090de2f..ec0ea1daf2af1b2872479b345a5111bf23f58643 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,22 +1,11 @@
 version: "3.7"
 services:
   nut:
-    #image: containers.ethitter.com:443/docker/s3-object-expirer:latest
+    image: nut-upsd:latest
     build:
       context: ./context
+    ports:
+      - 3493:3493
     restart: unless-stopped
-    # TODO: mount a dir
-#    secrets:
-#      - source: s3_config
-#        target: /s3_config
-#      - source: s3_bucket
-#        target: /s3_bucket
-#      - source: s3_expire_days
-#        target: /s3_expire_days
-#secrets:
-#  s3_config:
-#    file: ./config/.s3cfg
-#  s3_bucket:
-#    file: ./config/bucket
-#  s3_expire_days:
-#    file: ./config/expire_age_days
+    volumes:
+      - ./config/:/opt/nut-config