diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..02db981
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,22 @@
+FROM python:3-alpine
+
+ARG BUILD_VERSION
+
+# Create config volume
+VOLUME /config
+
+# Create Working Directory
+WORKDIR /app
+
+# Install enoceanmqtt and requirements
+RUN apk add --no-cache git
+RUN python3 -m pip install --upgrade pip && \
+    pip3 install pyyaml && \
+    pip3 install tinydb && \
+    pip3 install git+https://github.com/mak-gitdev/enocean.git && \
+    pip3 install git+https://github.com/embyt/enocean-mqtt.git
+
+COPY HA_enoceanmqtt HA_enoceanmqtt/
+
+# Set entrypoint
+ENTRYPOINT [ "python", "-m", "HA_enoceanmqtt.main", "/config/enoceanmqtt.conf" ]
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 6cfe07f..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM python:3-alpine
-
-ARG BUILD_VERSION
-
-# Create config volume
-VOLUME /config
-
-# Create Working Directory
-WORKDIR /app
-
-# Install enoceanmqtt and requirements
-RUN apk add --no-cache git && \
-    python3 -m pip install --upgrade pip && \
-    pip3 install pyyaml && \
-    pip3 install tinydb && \
-    pip3 install git+https://github.com/mak-gitdev/enocean.git && \
-    git clone https://github.com/embyt/enocean-mqtt.git && \
-    cd enocean-mqtt && python3 setup.py develop && cd .. && \
-    if [ "${BUILD_VERSION}" = "head" ]; then \
-        echo "Installing from repository head" && \
-        git clone -b develop --single-branch --depth 1 https://github.com/mak-gitdev/HA_enoceanmqtt.git ; \
-    else \
-        if [ -z "${BUILD_VERSION##*.*.*}" ]; then \
-            echo "Installing development version ${BUILD_VERSION%-*}" ; \
-        else \
-            echo "Installing stable version ${BUILD_VERSION%-*}" ; \
-        fi; \
-        wget -nv -O "/app.tar.gz" \
-            "https://github.com/mak-gitdev/HA_enoceanmqtt/archive/refs/tags/${BUILD_VERSION%-*}.tar.gz" && \
-        echo "Extracting /app.tar.gz" && tar xzf "/app.tar.gz" && \
-        rm "/app.tar.gz" && \
-        mv -v "HA_enoceanmqtt-${BUILD_VERSION%-*}" HA_enoceanmqtt ; \
-    fi; \
-    cp -rf HA_enoceanmqtt/enoceanmqtt enocean-mqtt && \
-    rm -rf HA_enoceanmqtt
-
-# Set entrypoint
-ENTRYPOINT [ "python", "/usr/local/bin/enoceanmqtt", "/config/enoceanmqtt.conf" ]