diff --git a/files/common/etc/profile.d/set-umask-for-all-users.sh b/files/common/etc/profile.d/set-umask-for-all-users.sh
new file mode 100644
index 00000000..87fcedce
--- /dev/null
+++ b/files/common/etc/profile.d/set-umask-for-all-users.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+umask 022
diff --git a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
index bfced464..81966fb8 100644
--- a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
+++ b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
@@ -682,20 +682,11 @@
     - variant == "internal-buildserver"
     - not ansible_is_chroot
 
+#
 # CIS: Set default umask (DLPX-86533)
-# We need to set default umask as 022 in the /etc/profile and /etc/bash.bashrc files,
+# We need to set default umask as 022 in the /etc/bash.bashrc file,
 # so that the same can be applied for all the users on the engine.
-- blockinfile:
-    path: /etc/profile.d/set-umask-for-all-users.sh
-    create: yes
-    block: |
-      #!/bin/sh
-      umask 022
-
-- file:
-    path: /etc/profile.d/set-umask-for-all-users.sh
-    mode: '0755'
-
+#
 - blockinfile:
     path: /etc/bash.bashrc
     block: |