diff --git a/docker-compose.yml b/docker-compose.yml
index ea19345..4adb86c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@
 
 services:
     main-gitbucket:
-      image: pgollor/gitbucket:4.15.0
+      image: pgollor/gitbucket:4.16.0
       restart: always
       depends_on:
         - mysql-gitbucket
@@ -22,8 +22,8 @@
       tmpfs:
         - /tmp
       ports:
-        - "${GITBUCKET_BIND:-127.0.0.1}:${GITBUCKET_WEB_PORT:-8080}:8080"
-        - "${GITBUCKET_BIND:-127.0.0.1}:${GITBUCKET_SSH_PORT:-29418}:29418"
+        - "${GITBUCKET_WEB_BIND:-127.0.0.1}:${GITBUCKET_WEB_PORT:-8080}:8080"
+        - "${GITBUCKET_SSH_BIND:-127.0.0.1}:${GITBUCKET_SSH_PORT:-29418}:29418"
       networks:
         gitbucket-network:
           ipv4_address: 172.22.2.250
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3ab055e..8346f87 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,7 +16,7 @@
 RUN apk add ca-certificates wget su-exec git
 
 # get gitbucket
-RUN wget https://github.com/gitbucket/gitbucket/releases/download/4.15.0/gitbucket.war -O $GITBUCKET_HOME/latest.war
+RUN wget https://github.com/gitbucket/gitbucket/releases/download/4.16.0/gitbucket.war -O $GITBUCKET_HOME/latest.war
 
 # clean
 RUN apk del wget
diff --git a/gitbucket.conf b/gitbucket.conf
index a0493f1..ef291bd 100644
--- a/gitbucket.conf
+++ b/gitbucket.conf
@@ -1,6 +1,9 @@
 ## gitbucket configuration
-# host to bind the ports below to
-GITBUCKET_BIND=127.0.0.1
+# address to bind the the web port to
+GITBUCKET_WEB_BIND=127.0.0.1
+
+# address ti bind the ssh port to
+GITBUCKET_SSH_BIND=127.0.0.1
 
 # web port
 GITBUCKET_WEB_PORT=8080