diff --git a/Changelog.md b/Changelog.md
index 5db40ef6..5b2c5a1e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to
 **latest**
 - expose rack_attack configuration options
 - gitlab-shell: upgrade to v.2.6.8
+- gitlab: upgrade to CE v8.2.1
 
 **8.2.0**
 - gitlab-shell: upgrade to v.2.6.7
diff --git a/Dockerfile b/Dockerfile
index 0cec7c4e..02ad0942 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM sameersbn/ubuntu:14.04.20151117
 MAINTAINER sameer@damagehead.com
 
-ENV GITLAB_VERSION=8.2.0 \
+ENV GITLAB_VERSION=8.2.1 \
     GITLAB_SHELL_VERSION=2.6.8 \
     GITLAB_WORKHORSE_VERSION=0.4.2 \
     GITLAB_USER="git" \
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index 90fad1fe..4701d658 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -124,6 +124,12 @@ production: &base
     # The mailbox where incoming mail will end up. Usually "inbox".
     mailbox: "{{IMAP_MAILBOX}}"
 
+  ## Build Artifacts
+  artifacts:
+    enabled: true
+    # The location where build artifacts are stored (default: shared/artifacts).
+    # path: shared/artifacts
+
   ## Git LFS
   lfs:
     enabled: {{GITLAB_LFS_ENABLED}}