diff --git a/attachments/nano_attachment/nano_initializer.c b/attachments/nano_attachment/nano_initializer.c
index eaab6a0..65e5fd4 100644
--- a/attachments/nano_attachment/nano_initializer.c
+++ b/attachments/nano_attachment/nano_initializer.c
@@ -385,7 +385,7 @@ set_docker_id(NanoAttachment *attachment)
     }
 
     if (!uid_read) {
-        const char *env_var_name = "CLOUDGUARD_UID"; // Replace with your environment variable name
+        const char *env_var_name = "OPENAPPSEC_UID"; // Replace with your environment variable name
         const char *env_value = getenv(env_var_name);
 
         if (env_value) {
diff --git a/docker/openappsec-waf-webhook/webhook_server.py b/docker/openappsec-waf-webhook/webhook_server.py
index bd52732..3b0130a 100755
--- a/docker/openappsec-waf-webhook/webhook_server.py
+++ b/docker/openappsec-waf-webhook/webhook_server.py
@@ -515,7 +515,7 @@ def mutate():
 
         if ISTIO_CONTAINER_NAME:
             add_env_if_not_exist(containers, ISTIO_CONTAINER_NAME, patches)
-            add_env_variable_value_from(containers, ISTIO_CONTAINER_NAME, 'CLOUDGUARD_UID', None, patches, value_from={"fieldRef": {"fieldPath": "metadata.uid"}})
+            add_env_variable_value_from(containers, ISTIO_CONTAINER_NAME, 'OPENAPPSEC_UID', None, patches, value_from={"fieldRef": {"fieldPath": "metadata.uid"}})
             if LIBRARY_PATH_VALUE:
                 add_env_variable(containers, ISTIO_CONTAINER_NAME, 'LD_LIBRARY_PATH', LIBRARY_PATH_VALUE, patches)
             if CONCURRENCY_CALC_VALUE:
@@ -562,7 +562,7 @@ def mutate():
             app.logger.debug("Added volume definition patch: %s", patches[-1])
 
             if DEPLOY_FILTER and SELECTOR_LABEL_NAME and SELECTOR_LABEL_VALUE:
-                RELEASE_NAME = os.getenv('RELEASE_NAME', 'cloudguard-waf-injected')
+                RELEASE_NAME = os.getenv('RELEASE_NAME', 'openappsec-waf-injected')
                 envoy_filter_name = RELEASE_NAME + "-waf-filter"
                 create_or_update_envoy_filter(envoy_filter_name, namespace, SELECTOR_LABEL_NAME, SELECTOR_LABEL_VALUE)
         else: