diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..901ac7ec
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+Dockerfile
+.github
+.venv
+node_modules
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..64eb314e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+FROM alpine:3.12
+
+ENV CI=true \
+    PATH="/app/.local/bin:${PATH}"
+
+RUN adduser -D -S -h /app -s /sbin/nologin -G root --uid 1001 app && \
+    apk --update add build-base python3 py3-pip nodejs npm openjdk11-jre
+
+COPY --chown=1001:0 . /app
+
+WORKDIR /app
+
+EXPOSE 8080
+
+USER 1001
+
+RUN make install
+
+CMD ["make", "serve"]
diff --git a/development.ini b/development.ini
index ba1b9b53..8941ef37 100644
--- a/development.ini
+++ b/development.ini
@@ -19,8 +19,8 @@ pyramid.includes =
 
 [server:main]
 use = egg:waitress#main
-host = 127.0.0.1
-port = 6543
+host = 0.0.0.0
+port = 8080
 
 ###
 # logging configuration
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..91ae4b13
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,7 @@
+version: '3.7'
+
+services:
+  app:
+    build: .
+    ports:
+      - '8080:8080'
diff --git a/oereb_client.yml b/oereb_client.yml
index 4f5531df..46c90b34 100644
--- a/oereb_client.yml
+++ b/oereb_client.yml
@@ -8,9 +8,9 @@ oereb_client:
   #   "icon"  - URL to image used as favicon
   application:
     title: ÖREB-Kataster, Kanton Basel-Landschaft
-    icon: http://localhost:6543/static/images/favicon.png
-    logo_canton: http://localhost:6543/samples/static/logo_bl.png
-    logo_oereb: http://localhost:6543/samples/static/logo_oereb.png
+    icon: http://localhost:8080/static/images/favicon.png
+    logo_canton: http://localhost:8080/samples/static/logo_bl.png
+    logo_oereb: http://localhost:8080/samples/static/logo_oereb.png
     local_storage_prefix: bl
 
   # View configuration
@@ -40,10 +40,10 @@ oereb_client:
   # Search field configuration
   search:
     api:
-      url: https://dev2.geoview.bl.ch/main/wsgi/bl_fulltextsearch
+      url: https://geoview.bl.ch/main/wsgi/bl_fulltextsearch
       limit: 5
     wfs:
-      url: https://dev2.geowms.bl.ch
+      url: https://geowms.bl.ch
       limit: 5
 
   # Link to external viewer/portal