diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js b/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js
index e77d1b4c7..4570f8afc 100644
--- a/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js
+++ b/app/docker/views/docker-features-configuration/docker-features-configuration.controller.js
@@ -1,3 +1,5 @@
+import { HIDE_AUTO_UPDATE_WINDOW } from 'Portainer/feature-flags/feature-ids';
+
 export default class DockerFeaturesConfigurationController {
   /* @ngInject */
   constructor($async, EndpointService, Notifications, StateManager) {
@@ -6,6 +8,8 @@ export default class DockerFeaturesConfigurationController {
     this.Notifications = Notifications;
     this.StateManager = StateManager;
 
+    this.limitedFeature = HIDE_AUTO_UPDATE_WINDOW;
+
     this.formValues = {
       enableHostManagementFeatures: false,
       allowVolumeBrowserForRegularUsers: false,
diff --git a/app/docker/views/docker-features-configuration/docker-features-configuration.html b/app/docker/views/docker-features-configuration/docker-features-configuration.html
index 3ca6b421f..3f9675b6c 100644
--- a/app/docker/views/docker-features-configuration/docker-features-configuration.html
+++ b/app/docker/views/docker-features-configuration/docker-features-configuration.html
@@ -41,6 +41,25 @@
               ></por-switch-field>
             </div>
           </div>
+          <!-- auto update window -->
+          <div class="col-sm-12 form-section-title">
+            Change Window Setting
+          </div>
+
+          <div class="form-group">
+            <div class="col-sm-12">
+              <por-switch-field
+                ng-model="$ctrl.state.autoUpdateSettings.Enabled"
+                name="disableSysctlSettingForRegularUsers"
+                label="Enable Change Window"
+                label-class="col-sm-7 col-lg-4"
+                feature="$ctrl.limitedFeature"
+                tooltip="Specify a timeframe during which automatic updates can occur in this environment."
+              >
+              </por-switch-field>
+            </div>
+          </div>
+
           <!-- security -->
           <div class="col-sm-12 form-section-title">
             Docker Security Settings
diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html
index b40814156..0eb4c342c 100644
--- a/app/kubernetes/views/configure/configure.html
+++ b/app/kubernetes/views/configure/configure.html
@@ -141,6 +141,24 @@
               </span>
             </div>
 
+            <!-- auto update window -->
+            <div class="col-sm-12 form-section-title">
+              Change Window Setting
+            </div>
+
+            <div class="form-group">
+              <div class="col-sm-12">
+                <por-switch-field
+                  ng-model="$ctrl.state.autoUpdateSettings.Enabled"
+                  name="disableSysctlSettingForRegularUsers"
+                  label="Enable Change Window"
+                  feature="ctrl.limitedFeatureAutoWindow"
+                  tooltip="Specify a timeframe during which automatic updates can occur in this environment."
+                >
+                </por-switch-field>
+              </div>
+            </div>
+
             <div class="col-sm-12 form-section-title">
               Security
             </div>
diff --git a/app/kubernetes/views/configure/configureController.js b/app/kubernetes/views/configure/configureController.js
index ac9468e2b..330cc9853 100644
--- a/app/kubernetes/views/configure/configureController.js
+++ b/app/kubernetes/views/configure/configureController.js
@@ -7,6 +7,7 @@ import KubernetesFormValidationHelper from 'Kubernetes/helpers/formValidationHel
 import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
 import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
 import { K8S_SETUP_DEFAULT } from '@/portainer/feature-flags/feature-ids';
+import { HIDE_AUTO_UPDATE_WINDOW } from 'Portainer/feature-flags/feature-ids';
 class KubernetesConfigureController {
   /* #region  CONSTRUCTOR */
 
@@ -39,6 +40,7 @@ class KubernetesConfigureController {
     this.onInit = this.onInit.bind(this);
     this.configureAsync = this.configureAsync.bind(this);
     this.limitedFeature = K8S_SETUP_DEFAULT;
+    this.limitedFeatureAutoWindow = HIDE_AUTO_UPDATE_WINDOW;
   }
   /* #endregion */
 
diff --git a/app/portainer/feature-flags/feature-flags.service.js b/app/portainer/feature-flags/feature-flags.service.js
index 274248a64..1d3874deb 100644
--- a/app/portainer/feature-flags/feature-flags.service.js
+++ b/app/portainer/feature-flags/feature-flags.service.js
@@ -29,6 +29,7 @@ export function featureService() {
       [FEATURE_IDS.REGISTRY_MANAGEMENT]: EDITIONS.BE,
       [FEATURE_IDS.S3_BACKUP_SETTING]: EDITIONS.BE,
       [FEATURE_IDS.TEAM_MEMBERSHIP]: EDITIONS.BE,
+      [FEATURE_IDS.HIDE_AUTO_UPDATE_WINDOW]: EDITIONS.BE,
       [FEATURE_IDS.FORCE_REDEPLOYMENT]: EDITIONS.BE,
     };
 
diff --git a/app/portainer/feature-flags/feature-ids.js b/app/portainer/feature-flags/feature-ids.js
index 13cc4b95a..c10cf30d4 100644
--- a/app/portainer/feature-flags/feature-ids.js
+++ b/app/portainer/feature-flags/feature-ids.js
@@ -9,4 +9,5 @@ export const TEAM_MEMBERSHIP = 'team-membership';
 export const HIDE_INTERNAL_AUTH = 'hide-internal-auth';
 export const EXTERNAL_AUTH_LDAP = 'external-auth-ldap';
 export const ACTIVITY_AUDIT = 'activity-audit';
+export const HIDE_AUTO_UPDATE_WINDOW = 'hide-auto-update-window';
 export const FORCE_REDEPLOYMENT = 'force-redeployment';