diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..6945cdb
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM decentral1se/jekyll:4
+
+COPY . ${WORKDIR}
+
+RUN bundle install
diff --git a/Gemfile b/Gemfile
index 1623dae..e0cac1c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,7 @@
 source "https://rubygems.org"
+
 ruby "2.7.1"
+
 gemspec
+
 gem "jekyll-feed"
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index da22536..92ffc5f 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -3,12 +3,6 @@ version: "3.7"
 
 services:
   jekyll:
-    command: >
-      jekyll serve \
-      --watch \
-      --force_polling \
-      --verbose \
-      --config _config.yml \
-      --trace
+    command: jekyll serve --watch --force_polling --trace
     volumes:
       - ".:/srv/jekyll"
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 92b3b6c..ee01a6e 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -3,11 +3,10 @@ version: "3.7"
 
 services:
   jekyll:
-    command: >
-      jekyll serve \
-      --verbose \
-      --config _config.yml \
-      --trace
+    image: decentral1se/autonomic.zone:latest
+    command: jekyll serve --host 0.0.0.0 --trace
+    environment:
+      JEKYLL_ENV: production
     networks:
       - proxy
     deploy: