1 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/ci/config/entry/image.rb b/lib/gitlab/ci/config/entry/image.rb
index 613f7ff3370..84e31ca1fc6 100644
--- a/lib/gitlab/ci/config/entry/image.rb
+++ b/lib/gitlab/ci/config/entry/image.rb
@@ -11,10 +11,7 @@ module Gitlab
           include ::Gitlab::Ci::Config::Entry::Imageable
 
           validations do
-            validates :config, allowed_keys: IMAGEABLE_ALLOWED_KEYS,
-                               if: :ci_docker_image_pull_policy_enabled?
-            validates :config, allowed_keys: IMAGEABLE_LEGACY_ALLOWED_KEYS,
-                               unless: :ci_docker_image_pull_policy_enabled?
+            validates :config, allowed_keys: IMAGEABLE_ALLOWED_KEYS
           end
 
           def value
@@ -25,7 +22,7 @@ module Gitlab
                 name: @config[:name],
                 entrypoint: @config[:entrypoint],
                 ports: (ports_value if ports_defined?),
-                pull_policy: (ci_docker_image_pull_policy_enabled? ? pull_policy_value : nil)
+                pull_policy: pull_policy_value
               }.compact
             else
               {}