diff --git a/app/kubernetes/converters/configMap.js b/app/kubernetes/converters/configMap.js
index 36025c506..76c142145 100644
--- a/app/kubernetes/converters/configMap.js
+++ b/app/kubernetes/converters/configMap.js
@@ -52,6 +52,7 @@ class KubernetesConfigMapConverter {
     res.metadata.uid = data.Id;
     res.metadata.name = data.Name;
     res.metadata.namespace = data.Namespace;
+    res.metadata.labels[KubernetesPortainerConfigurationOwnerLabel] = data.ConfigurationOwner;
     res.data = data.Data;
     return res;
   }
diff --git a/app/kubernetes/services/configurationService.js b/app/kubernetes/services/configurationService.js
index 1f421bfbd..dbc69a7db 100644
--- a/app/kubernetes/services/configurationService.js
+++ b/app/kubernetes/services/configurationService.js
@@ -87,21 +87,24 @@ class KubernetesConfigurationService {
   /**
    * UPDATE
    */
-  async updateAsync(formValues) {
+  async updateAsync(formValues, configuration) {
     try {
       if (formValues.Type === KubernetesConfigurationTypes.CONFIGMAP) {
         const configMap = KubernetesConfigMapConverter.configurationFormValuesToConfigMap(formValues);
+        configMap.ConfigurationOwner = configuration.ConfigurationOwner;
         await this.KubernetesConfigMapService.update(configMap);
       } else {
         const secret = KubernetesSecretConverter.configurationFormValuesToSecret(formValues);
+        secret.ConfigurationOwner = configuration.ConfigurationOwner;
         await this.KubernetesSecretService.update(secret);
       }
     } catch (err) {
       throw err;
     }
   }
-  update(config) {
-    return this.$async(this.updateAsync, config);
+
+  update(formValues, configuration) {
+    return this.$async(this.updateAsync, formValues, configuration);
   }
 
   /**
diff --git a/app/kubernetes/views/configurations/edit/configurationController.js b/app/kubernetes/views/configurations/edit/configurationController.js
index 52bf8a51a..f30012132 100644
--- a/app/kubernetes/views/configurations/edit/configurationController.js
+++ b/app/kubernetes/views/configurations/edit/configurationController.js
@@ -94,7 +94,7 @@ class KubernetesConfigurationController {
           { reload: true }
         );
       } else {
-        await this.KubernetesConfigurationService.update(this.formValues);
+        await this.KubernetesConfigurationService.update(this.formValues, this.configuration);
         this.Notifications.success('Configuration succesfully updated');
         this.$state.reload();
       }