diff --git a/Changelog.md b/Changelog.md
index 184bf4bf..0e6beb07 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,9 @@
 
 This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) for the list of changes in GitLab.
 
+**latest**
+- added `GITLAB_SIGNUP_ENABLED` option to enable/disable signups
+
 **8.6.6**
 - gitlab: upgrade to CE v8.6.6
 
diff --git a/README.md b/README.md
index 851c192f..179b83fa 100644
--- a/README.md
+++ b/README.md
@@ -785,6 +785,7 @@ Below is the complete list of available options that can be used to customize yo
 - **GITLAB_EMAIL_ENABLED**: Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration.
 - **GITLAB_INCOMING_EMAIL_ADDRESS**: The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`.
 - **GITLAB_INCOMING_EMAIL_ENABLED**: Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`.
+- **GITLAB_SIGNUP_ENABLED**: Enable or disable user signups (first run only). Default is `true`.
 - **GITLAB_USERNAME_CHANGE**: Enable or disable ability for users to change their username. Defaults is `true`.
 - **GITLAB_CREATE_GROUP**: Enable or disable ability for users to create groups. Defaults is `true`.
 - **GITLAB_PROJECTS_ISSUES**: Set if *issues* feature should be enabled by default for new projects. Defaults is `true`.
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 53ea02d7..83037543 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -75,6 +75,9 @@ production: &base
     ##   6 - Blue
     # default_theme: 2 # default: 2
 
+    # Enable or disable user signups (first run only)
+    signup_enabled: {{GITLAB_SIGNUP_ENABLED}}
+
     ## Automatic issue closing
     # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
     # This happens when the commit is pushed or merged into the default branch of a project.
diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults
index afc593f4..c5939b37 100644
--- a/assets/runtime/env-defaults
+++ b/assets/runtime/env-defaults
@@ -62,6 +62,7 @@ UNICORN_TIMEOUT=${UNICORN_TIMEOUT:-60}
 
 ##
 GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC}
+GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-true}
 GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true}
 GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true}
 GITLAB_PROJECTS_ISSUES=${GITLAB_PROJECTS_ISSUES:-true}
diff --git a/assets/runtime/functions b/assets/runtime/functions
index 9cdbc5dd..4bd5c7d4 100644
--- a/assets/runtime/functions
+++ b/assets/runtime/functions
@@ -1097,6 +1097,7 @@ configure_gitlab() {
     GITLAB_MAX_OBJECT_SIZE \
     GITLAB_SSH_HOST \
     GITLAB_SSH_PORT \
+    GITLAB_SIGNUP_ENABLED \
     GITLAB_USERNAME_CHANGE \
     GITLAB_CREATE_GROUP \
     GITLAB_TIMEOUT