diff --git a/.gitpod.yml b/.gitpod.yml
index e9cc798ed19..d546cc7f64a 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -16,8 +16,7 @@ tasks:
         # GitLab
         [[ -d /workspace/gitlab ]] && ln -fs /workspace/gitlab /workspace/gitlab-development-kit/gitlab
         mv /workspace/gitlab-development-kit/secrets.yml /workspace/gitlab-development-kit/gitlab/config
-        # update gdk.yml
-        gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
+        # ensure gdk.yml has correct instance settings
         gdk config set gitlab.rails.port 443
         gdk config set gitlab.rails.https.enabled true
         # reconfigure GDK
@@ -42,6 +41,13 @@ tasks:
           echo "$(date) – Updating GDK" | tee -a /workspace/startup.log
           gdk update
         fi
+        # ensure gdk.yml has correct instance settings
+        gdk config set gitlab.rails.hostname $(gp url 3000 | sed -e 's+^http[s]*://++')
+        gdk config set gitlab.rails.port 443
+        gdk config set gitlab.rails.https.enabled true
+        # reconfigure GDK
+        echo "$(date) – Reconfiguring GDK" | tee -a /workspace/startup.log
+        gdk reconfigure
         # start GDK
         echo "$(date) – Starting GDK" | tee -a /workspace/startup.log
         export DEV_SERVER_PUBLIC_ADDR=$(gp url 3808)
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index f1c728b84fd..7b8b756487b 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -67,7 +67,7 @@ export default {
           spacing: 'section-10',
         },
         autoStop: {
-          title: s__('Environments|Auto stop in'),
+          title: s__('Environments|Auto stop'),
           spacing: 'section-10',
         },
         actions: {
diff --git a/doc/administration/monitoring/performance/img/performance_bar_v14_4.png b/doc/administration/monitoring/performance/img/performance_bar_v14_4.png
index 9ddc9825202..388d628c7c4 100644
Binary files a/doc/administration/monitoring/performance/img/performance_bar_v14_4.png and b/doc/administration/monitoring/performance/img/performance_bar_v14_4.png differ
diff --git a/doc/administration/packages/img/gitlab-registry-architecture.png b/doc/administration/packages/img/gitlab-registry-architecture.png
index 742678d5e11..d6e8f935ad2 100644
Binary files a/doc/administration/packages/img/gitlab-registry-architecture.png and b/doc/administration/packages/img/gitlab-registry-architecture.png differ
diff --git a/doc/administration/troubleshooting/img/database-query-dialog_v14_3.png b/doc/administration/troubleshooting/img/database-query-dialog_v14_3.png
index 12a6db29b00..197cfa17da2 100644
Binary files a/doc/administration/troubleshooting/img/database-query-dialog_v14_3.png and b/doc/administration/troubleshooting/img/database-query-dialog_v14_3.png differ
diff --git a/doc/administration/troubleshooting/img/obtaining-a-session-cookie-for-request_v14_3.png b/doc/administration/troubleshooting/img/obtaining-a-session-cookie-for-request_v14_3.png
index ea55e0e5727..a63ebf9ecf2 100644
Binary files a/doc/administration/troubleshooting/img/obtaining-a-session-cookie-for-request_v14_3.png and b/doc/administration/troubleshooting/img/obtaining-a-session-cookie-for-request_v14_3.png differ
diff --git a/doc/integration/mattermost/img/gitlab-mattermost.png b/doc/integration/mattermost/img/gitlab-mattermost.png
index 1eedcb391b0..c3b019988d0 100644
Binary files a/doc/integration/mattermost/img/gitlab-mattermost.png and b/doc/integration/mattermost/img/gitlab-mattermost.png differ
diff --git a/doc/user/analytics/img/project_vsa_filter_v14_3.png b/doc/user/analytics/img/project_vsa_filter_v14_3.png
index 0cbf16fe5a2..d3fcad31909 100644
Binary files a/doc/user/analytics/img/project_vsa_filter_v14_3.png and b/doc/user/analytics/img/project_vsa_filter_v14_3.png differ
diff --git a/doc/user/analytics/img/project_vsa_stage_table_v14_4.png b/doc/user/analytics/img/project_vsa_stage_table_v14_4.png
index 99a08152108..e65296062f6 100644
Binary files a/doc/user/analytics/img/project_vsa_stage_table_v14_4.png and b/doc/user/analytics/img/project_vsa_stage_table_v14_4.png differ
diff --git a/doc/user/group/epics/img/epic_view_roadmap_v12_9.png b/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
index e8224ced7e9..3a33a6c4cf8 100644
Binary files a/doc/user/group/epics/img/epic_view_roadmap_v12_9.png and b/doc/user/group/epics/img/epic_view_roadmap_v12_9.png differ
diff --git a/doc/user/group/import/img/new_group_navigation_v13_8.png b/doc/user/group/import/img/new_group_navigation_v13_8.png
index 4953207ea5b..40be3dd41d2 100644
Binary files a/doc/user/group/import/img/new_group_navigation_v13_8.png and b/doc/user/group/import/img/new_group_navigation_v13_8.png differ
diff --git a/doc/user/group/roadmap/img/roadmap_view_v14_3.png b/doc/user/group/roadmap/img/roadmap_view_v14_3.png
index ca4b87b9fdd..ea5e870680e 100644
Binary files a/doc/user/group/roadmap/img/roadmap_view_v14_3.png and b/doc/user/group/roadmap/img/roadmap_view_v14_3.png differ
diff --git a/doc/user/project/integrations/img/slack_setup.png b/doc/user/project/integrations/img/slack_setup.png
index 8acae659fb4..d8aedf84be5 100644
Binary files a/doc/user/project/integrations/img/slack_setup.png and b/doc/user/project/integrations/img/slack_setup.png differ
diff --git a/doc/user/project/repository/img/web_editor_new_branch_dropdown_v14_1.png b/doc/user/project/repository/img/web_editor_new_branch_dropdown_v14_1.png
index 20d76797977..df5e803d77a 100644
Binary files a/doc/user/project/repository/img/web_editor_new_branch_dropdown_v14_1.png and b/doc/user/project/repository/img/web_editor_new_branch_dropdown_v14_1.png differ
diff --git a/doc/user/project/repository/img/web_editor_new_branch_from_issue_v14_1.png b/doc/user/project/repository/img/web_editor_new_branch_from_issue_v14_1.png
index 150ec3ebf90..732173d9c1b 100644
Binary files a/doc/user/project/repository/img/web_editor_new_branch_from_issue_v14_1.png and b/doc/user/project/repository/img/web_editor_new_branch_from_issue_v14_1.png differ
diff --git a/doc/user/project/repository/img/web_editor_new_directory_dropdown_v14_1.png b/doc/user/project/repository/img/web_editor_new_directory_dropdown_v14_1.png
index 326605baaab..bbdb9bca199 100644
Binary files a/doc/user/project/repository/img/web_editor_new_directory_dropdown_v14_1.png and b/doc/user/project/repository/img/web_editor_new_directory_dropdown_v14_1.png differ
diff --git a/doc/user/project/repository/img/web_editor_new_file_dropdown_v14_1.png b/doc/user/project/repository/img/web_editor_new_file_dropdown_v14_1.png
index 4a4c1f8cd11..1a92555457a 100644
Binary files a/doc/user/project/repository/img/web_editor_new_file_dropdown_v14_1.png and b/doc/user/project/repository/img/web_editor_new_file_dropdown_v14_1.png differ
diff --git a/doc/user/project/repository/img/web_editor_template_dropdown_mit_license_v14_1.png b/doc/user/project/repository/img/web_editor_template_dropdown_mit_license_v14_1.png
index d0bdefaa437..5a5562ed38c 100644
Binary files a/doc/user/project/repository/img/web_editor_template_dropdown_mit_license_v14_1.png and b/doc/user/project/repository/img/web_editor_template_dropdown_mit_license_v14_1.png differ
diff --git a/doc/user/project/repository/img/web_editor_upload_file_dropdown_v14_1.png b/doc/user/project/repository/img/web_editor_upload_file_dropdown_v14_1.png
index 1b2fa59726a..ad949aae8ce 100644
Binary files a/doc/user/project/repository/img/web_editor_upload_file_dropdown_v14_1.png and b/doc/user/project/repository/img/web_editor_upload_file_dropdown_v14_1.png differ
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a125c463087..87fab20908d 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -12984,7 +12984,7 @@ msgstr ""
 msgid "Environments|Are you sure you want to stop this environment?"
 msgstr ""
 
-msgid "Environments|Auto stop in"
+msgid "Environments|Auto stop"
 msgstr ""
 
 msgid "Environments|Auto stops %{autoStopAt}"