diff --git a/Changelog.md b/Changelog.md
index 468a7d9f..56337a5a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+**6.0.1-1**
+- Replace unicorn application server with puma #569
+
 **6.0.1**
 - redmine: upgrade to v6.0.1
 - `make test-release` now creates certificates for ssl
diff --git a/README.md b/README.md
index a67a7704..d1edc57e 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ Dockerfile to build a [Redmine](http://www.redmine.org/) container image.
 
 ## Version
 
-Current Version: **sameersbn/redmine:6.0.1**
+Current Version: **sameersbn/redmine:6.0.1-1**
 
 _P.S.: If your installation depends on various third party plugins, please stick with 2.6.xx series to avoid breakage._
 
@@ -108,7 +108,7 @@ docker pull sameersbn/redmine:latest
 Since version `2.4.2`, the image builds are being tagged. You can now pull a particular version of redmine by specifying the version number. For example,
 
 ```bash
-docker pull sameersbn/redmine:6.0.1
+docker pull sameersbn/redmine:6.0.1-1
 ```
 
 Alternately you can build the image yourself.
@@ -146,7 +146,7 @@ docker run --name=redmine -d \
   --env='REDMINE_PORT=10083' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 **NOTE**: Please allow a minute or two for the Redmine application to start.
@@ -193,7 +193,7 @@ Volumes can be mounted in docker by specifying the **'-v'** option in the docker
 docker run --name=redmine -it --rm \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 ## Database
@@ -244,7 +244,7 @@ docker run --name=redmine -it --rm \
   --env='DB_USER=redmine' --env='DB_PASS=password' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 This will initialize the redmine database and after a couple of minutes your redmine instance should be ready to use.
@@ -290,7 +290,7 @@ We are now ready to start the redmine application.
 docker run --name=redmine -it --rm --link=mysql-redmine:mysql \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images:
@@ -321,7 +321,7 @@ docker run --name=redmine -it --rm \
   --env='DB_USER=redmine' --env='DB_PASS=password' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 This will initialize the redmine database and after a couple of minutes your redmine instance should be ready to use.
@@ -367,7 +367,7 @@ We are now ready to start the redmine application.
 docker run --name=redmine -it --rm --link=postgresql-redmine:postgresql \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -390,7 +390,7 @@ _Assuming that the memcached server host is 192.168.1.100_
 ```bash
 docker run --name=redmine -it --rm \
   --env='MEMCACHE_HOST=192.168.1.100' --env='MEMCACHE_PORT=11211' \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 ### Linking to Memcached Container
@@ -409,7 +409,7 @@ Now you can link memcached to the redmine image:
 
 ```bash
 docker run --name=redmine -it --rm --link=memcached-redmine:memcached \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 ### Mail
@@ -423,7 +423,7 @@ docker run --name=redmine -it --rm \
   --env='SMTP_USER=USER@gmail.com' --env='SMTP_PASS=PASSWORD' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 If you are not using google mail, then please configure the SMTP host and port using the `SMTP_HOST` and `SMTP_PORT` configuration parameters.
@@ -509,7 +509,7 @@ docker run --name=redmine -d \
   --env='REDMINE_PORT=10445' --env='REDMINE_HTTPS=true' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -528,7 +528,7 @@ docker run --name=redmine -d \
   --env='NGINX_HSTS_MAXAGE=2592000'
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -548,7 +548,7 @@ docker run --name=redmine -d --publish=10083:80 \
   --env='REDMINE_HTTPS=true' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 ### Deploy to a subdirectory (relative url root)
@@ -562,7 +562,7 @@ docker run --name=redmine -d --publish=10083:80 \
   --env='REDMINE_RELATIVE_URL_ROOT=/redmine' \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 Redmine will now be accessible at the `/redmine` path, e.g. `http://www.example.com/redmine`.
@@ -593,7 +593,7 @@ Also the container processes seem to be executed as the host's user/group `1000`
 ```bash
 docker run --name=redmine -it --rm [options] \
   --env="USERMAP_UID=500" --env="USERMAP_GID=500" \
-  sameersbn/redmine:6.0.1
+  sameersbn/redmine:6.0.1-1
 ```
 
 ### Available Configuration Parameters
@@ -770,7 +770,7 @@ To uninstall plugins you need to first tell redmine about the plugin you need to
 docker run --name=redmine -it --rm \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1 \
+  sameersbn/redmine:6.0.1-1 \
   app:rake redmine:plugins:migrate NAME=plugin_name VERSION=0
 ```
 
@@ -788,7 +788,7 @@ For example, to remove the recurring tasks plugin:
 docker run --name=redmine -it --rm \
   --volume=/srv/docker/redmine/redmine:/home/redmine/data \
   --volume=/srv/docker/redmine/redmine-logs:/var/log/redmine/ \
-  sameersbn/redmine:6.0.1 \
+  sameersbn/redmine:6.0.1-1 \
   app:rake redmine:plugins:migrate NAME=recurring_tasks VERSION=0
 rm -rf /srv/docker/redmine/redmine/plugins/recurring_tasks
 ```
@@ -868,7 +868,7 @@ Relaunch the container with the `app:backup:create` argument.
 
 ```bash
 docker run --name redmine -it --rm [OPTIONS] \
-  sameersbn/redmine:6.0.1 app:backup:create
+  sameersbn/redmine:6.0.1-1 app:backup:create
 ```
 
 The backup will be created in the `backups/` folder of the [Data Store](#data-store). You can change the location using the `REDMINE_BACKUPS_DIR` configuration parameter.
@@ -899,7 +899,7 @@ Relaunch the container with the `app:backup:restore` argument. Ensure you launch
 
 ```bash
 docker run --name redmine -it --rm [OPTIONS] \
-  sameersbn/redmine:6.0.1 app:backup:restore
+  sameersbn/redmine:6.0.1-1 app:backup:restore
 ```
 
 A list of existing backups will be displayed. Select a backup you wish to restore.
@@ -908,7 +908,7 @@ To avoid this interaction you can specify the backup filename using the `BACKUP`
 
 ```bash
 docker run --name redmine -it --rm [OPTIONS] \
-  sameersbn/redmine:6.0.1 app:backup:restore BACKUP=1417624827_redmine_backup.tar
+  sameersbn/redmine:6.0.1-1 app:backup:restore BACKUP=1417624827_redmine_backup.tar
 ```
 
 ## Automated backups
@@ -927,7 +927,7 @@ The `app:rake` command allows you to run redmine rake tasks. To run a rake task
 
 ```bash
 docker run --name=redmine -d [OPTIONS] \
-  sameersbn/redmine:6.0.1 app:rake redmine:email:test[admin]
+  sameersbn/redmine:6.0.1-1 app:rake redmine:email:test[admin]
 ```
 
 You can also use `docker exec` to run rake tasks on running redmine instance. For example,
@@ -940,7 +940,7 @@ Similarly, to remove uploaded files left unattached
 
 ```bash
 docker run --name=redmine -d [OPTIONS] \
-  sameersbn/redmine:6.0.1 app:rake redmine:attachments:prune
+  sameersbn/redmine:6.0.1-1 app:rake redmine:attachments:prune
 ```
 
 Or,
@@ -958,7 +958,7 @@ To upgrade to newer redmine releases, simply follow this 4 step upgrade procedur
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/redmine:6.0.1
+docker pull sameersbn/redmine:6.0.1-1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -980,7 +980,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
 - **Step 4**: Start the image
 
 ```bash
-docker run --name=redmine -d [OPTIONS] sameersbn/redmine:6.0.1
+docker run --name=redmine -d [OPTIONS] sameersbn/redmine:6.0.1-1
 ```
 
 When an upgrade is in progress the variable `REDMINE_WAS_UPDATED` will be defined and set to `yes`.  This allows easy integration of individual upgrade-steps via `entrypoint.custom.sh`, `pre-install.sh`, and `post-install.sh`.
@@ -997,10 +997,10 @@ docker exec -it redmine bash
 
 ## Upgrading to next redmine release
 
-- Commands to run to update image to next redmine release, examples are from 6.0.1 to 6.0.2
+- Commands to run to update image to next redmine release, examples are from 6.0.1-1 to 6.0.2
 
 ```bash
-sed -i 's/6.0.1/6.0.1/g' VERSION README.md docker-compose-memcached.yml docker-compose-mysql.yml docker-compose-ssl.yml docker-compose-sqlite3.yml docker-compose-mariadb.yml Dockerfile docker-compose.yml
+sed -i 's/6.0.1-1/6.0.1-1/g' VERSION README.md docker-compose-memcached.yml docker-compose-mysql.yml docker-compose-ssl.yml docker-compose-sqlite3.yml docker-compose-mariadb.yml Dockerfile docker-compose.yml
 vim Changelog.md # Update change log
 make test-release # Runs the following
 #  sudo rm -rf /srv/docker/redmine/ # Clean old run
@@ -1018,7 +1018,7 @@ make test-release # Runs the following
 ```
 
 - Open https://github.com/sameersbn/docker-redmine/releases and Draft new release
-- Select tag 6.0.1 and set release title to 6.0.1
+- Select tag 6.0.1-1 and set release title to 6.0.1-1
 - Publish release
 - Check https://quay.io/repository/sameersbn/redmine?tab=info and https://hub.docker.com/r/sameersbn/redmine/builds for build progress
 
diff --git a/VERSION b/VERSION
index 5fe60723..c9af62a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.1
+6.0.1-1
diff --git a/docker-compose-mariadb.yml b/docker-compose-mariadb.yml
index 9cae4280..950d95ba 100644
--- a/docker-compose-mariadb.yml
+++ b/docker-compose-mariadb.yml
@@ -20,7 +20,7 @@ services:
 
   redmine:
     build: ./
-    image: sameersbn/redmine:6.0.1
+    image: sameersbn/redmine:6.0.1-1
     depends_on:
       - database
     environment:
diff --git a/docker-compose-memcached.yml b/docker-compose-memcached.yml
index fcd81265..2e158525 100644
--- a/docker-compose-memcached.yml
+++ b/docker-compose-memcached.yml
@@ -16,7 +16,7 @@ services:
 
   redmine:
     build: ./
-    image: sameersbn/redmine:6.0.1
+    image: sameersbn/redmine:6.0.1-1
     depends_on:
       - postgresql
       - memcached
diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
index 4e1e7c4f..7b6dbd9e 100644
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@@ -15,7 +15,7 @@ services:
 
   redmine:
     build: ./
-    image: sameersbn/redmine:6.0.1
+    image: sameersbn/redmine:6.0.1-1
     depends_on:
       - mysql
     environment:
diff --git a/docker-compose-sqlite3.yml b/docker-compose-sqlite3.yml
index d3928ac1..9bc1cf25 100644
--- a/docker-compose-sqlite3.yml
+++ b/docker-compose-sqlite3.yml
@@ -1,7 +1,7 @@
 services:
   redmine:
     build: ./
-    image: sameersbn/redmine:6.0.1
+    image: sameersbn/redmine:6.0.1-1
     environment:
       - TZ=Asia/Kolkata
 
diff --git a/docker-compose-ssl.yml b/docker-compose-ssl.yml
index e6f65f0a..35a349b9 100644
--- a/docker-compose-ssl.yml
+++ b/docker-compose-ssl.yml
@@ -10,7 +10,7 @@ services:
 
   redmine:
     build: ./
-    image: sameersbn/redmine:6.0.1
+    image: sameersbn/redmine:6.0.1-1
     depends_on:
       - postgresql
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 30999e58..1cd0e1d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       start_period: 10s
   redmine:
     build: ./
-    image: sameersbn/redmine:6.0.1
+    image: sameersbn/redmine:6.0.1-1
     depends_on:
       postgresql:
         condition: service_healthy