diff --git a/Dockerfile b/Dockerfile
index 5c85ed8..079d853 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,3 +14,4 @@ RUN apk add --update bash easy-rsa  && \
     ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
     wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.3-rc.1/openvpn-user-linux-amd64.tar.gz -O - | tar xz -C /usr/local/bin && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
+CMD ["/app/ovpn-admin", "--debug", "--ovpn.network=172.16.100.0/22", "--master.sync-token=TOKEN", "--easyrsa.path=/mnt/easyrsa", "--easyrsa.index-path=/mnt/easyrsa/pki/index.txt", "--ovpn.server=127.0.0.1:7777:tcp"]
diff --git a/Dockerfile.openvpn b/Dockerfile.openvpn
index ee5f785..a87b972 100644
--- a/Dockerfile.openvpn
+++ b/Dockerfile.openvpn
@@ -5,3 +5,4 @@ RUN apk add --update bash openvpn easy-rsa  && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 COPY setup/ /etc/openvpn/setup
 RUN chmod +x /etc/openvpn/setup/configure.sh
+CMD ["/etc/openvpn/setup/configure.sh"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3eea317..001fb77 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,7 +6,6 @@ services:
       context: .
       dockerfile: Dockerfile.openvpn
     image: openvpn:local
-    command: /etc/openvpn/setup/configure.sh
     cap_add:
       - NET_ADMIN
     ports:
@@ -19,7 +18,6 @@ services:
     build:
       context: .
     image: ovpn-admin:local
-    command: /app/ovpn-admin --debug --ovpn.network="172.16.100.0/22" --master.sync-token="TOKEN" --easyrsa.path="/mnt/easyrsa" --easyrsa.index-path="/mnt/easyrsa/pki/index.txt" --ovpn.server="127.0.0.1:7777:tcp"
     network_mode: service:openvpn
     volumes:
       - ./easyrsa_master:/mnt/easyrsa