diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 82f10424..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,15 +0,0 @@
-*.md
-*.xml
-*.yml
-*.txt
-*.html
-
-.gitignore
-.git/
-contrib/
-airsonic-main/
-!airsonic-main/target/airsonic.war
-subsonic-rest-api/
-airsonic-sonos-api/
-repo/
-target/
diff --git a/install/docker/.dockerignore b/install/docker/.dockerignore
new file mode 100644
index 00000000..62ed4a05
--- /dev/null
+++ b/install/docker/.dockerignore
@@ -0,0 +1,4 @@
+!target/airsonic.war
+.gitignore
+pom.xml
+target/
diff --git a/Dockerfile b/install/docker/Dockerfile
similarity index 90%
rename from Dockerfile
rename to install/docker/Dockerfile
index 333b094e..77be01af 100644
--- a/Dockerfile
+++ b/install/docker/Dockerfile
@@ -8,7 +8,7 @@ ENV UID=1001 GID=1001 AIRSONIC_PORT=4040 AIRSONIC_DIR=/airsonic
WORKDIR $AIRSONIC_DIR
COPY dockerfiles/run.sh /usr/local/bin/run.sh
-COPY airsonic-main/target/airsonic.war airsonic.war
+COPY target/dependency/airsonic-main-6.3-SNAPSHOT.war airsonic.war
RUN apk --no-cache add \
ffmpeg \
diff --git a/install/docker/pom.xml b/install/docker/pom.xml
new file mode 100644
index 00000000..5d22b330
--- /dev/null
+++ b/install/docker/pom.xml
@@ -0,0 +1,61 @@
+
+
+
+ 4.0.0
+
+ ../../pom.xml
+ airsonic
+ 6.3-SNAPSHOT
+ org.airsonic.player
+
+ pom
+ airsonic-docker
+ Airsonic Docker Image
+
+
+
+ org.airsonic.player
+ airsonic-main
+ 6.3-SNAPSHOT
+ war
+
+
+
+
+
+
+ com.spotify
+ dockerfile-maven-plugin
+ 1.3.4
+
+
+ default
+
+ build
+
+ package
+
+
+
+ airsonic/airsonic
+ ${project.version}
+
+
+
+ maven-dependency-plugin
+ org.apache.maven.plugins
+ 3.0.1
+
+
+ copy
+ generate-sources
+
+ copy-dependencies
+
+
+
+
+
+
+
+
diff --git a/dockerfiles/run.sh b/install/docker/run.sh
similarity index 100%
rename from dockerfiles/run.sh
rename to install/docker/run.sh
diff --git a/pom.xml b/pom.xml
index c4c59c82..910d636b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,7 @@
subsonic-rest-api
airsonic-sonos-api
airsonic-main
+ install/docker
@@ -169,16 +170,6 @@
-
- com.spotify
- dockerfile-maven-plugin
- 1.3.4
- false
-
- airsonic/airsonic
- ${project.version}
-
-