diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 3d4f3b4..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.dev
-
-# Jetbrains
-/.idea
-/*.iml
diff --git a/.travis.yml b/.travis.yml
index e0257fc..9f43c7e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ services:
 
 env:
   global:
-    - VERSION=15802
+    - VERSION=16429
     - GITHUB_REPO=crazy-max/docker-jetbrains-license-server
     - DOCKER_USERNAME=crazymax
     - DOCKER_REPONAME=jetbrains-license-server
@@ -37,7 +37,7 @@ install:
     docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
     --build-arg VCS_REF=${TRAVIS_COMMIT::8} \
     --build-arg VERSION=${VERSION} \
-    -t $DOCKER_USERNAME/$DOCKER_REPONAME .
+    -t $DOCKER_USERNAME/$DOCKER_REPONAME ./docker/Dockerfile ./docker
 
 before_script:
   - docker run -d -p 8000:80 -e JLS_VIRTUAL_HOSTS=$WAN_IP --name $DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 283fd5e..f96f188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 16429-RC1 (2018/03/20)
+
+* Upgrade to JetBrains License Server 16429
+
 ## 15802-RC2 (2018/02/16)
 
 * Add `JLS_CONTEXT` and `JLS_REPORT_OUT_OF_LICENSE` env vars
diff --git a/README.md b/README.md
index b0c5853..2799538 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
 
 ## Usage
 
-Docker compose is the recommended way to run this image. You can use the following [docker compose template](docker-compose.yml), then run the container :
+Docker compose is the recommended way to run this image. You can use the following [docker compose template](docker/docker-compose.yml), then run the container :
 
 ```bash
 docker-compose up -d
diff --git a/docker/.dockerignore b/docker/.dockerignore
new file mode 100644
index 0000000..8e924d9
--- /dev/null
+++ b/docker/.dockerignore
@@ -0,0 +1 @@
+/docker-compose.yml
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 93%
rename from Dockerfile
rename to docker/Dockerfile
index a26d6d0..4b9b1be 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -19,8 +19,8 @@ RUN apk --update --no-cache add tzdata \
   && rm -rf /var/cache/apk/* /tmp/*
 
 ENV JLS_PATH="/opt/jetbrains-license-server" \
-  JLS_VERSION="15802" \
-  JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181"
+  JLS_VERSION="16429" \
+  JLS_SHA256="4e3c6ecbfd95467e2332589321d259e827db8dfc6a5279f5659e22530cdb6443"
 
 ADD entrypoint.sh /entrypoint.sh
 
diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to docker/docker-compose.yml
diff --git a/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from entrypoint.sh
rename to docker/entrypoint.sh