diff --git a/devops-service/db/validators/image/bootstrap_template.rb b/devops-service/db/validators/image/bootstrap_template.rb
index 2ced224..67bc070 100644
--- a/devops-service/db/validators/image/bootstrap_template.rb
+++ b/devops-service/db/validators/image/bootstrap_template.rb
@@ -8,22 +8,12 @@ module Validators
       include BootstrapTemplatesCommands
 
       def valid?
-        if @model.bootstrap_template
-          available_templates.include?(@model.bootstrap_template)
-        else
-          true
-        end
+        get_templates.include?(@model.bootstrap_template)
       end
 
       def message
         "Invalid bootstrap template '#{@model.bootstrap_template}' for image '#{@model.id}'"
       end
-
-      private
-
-      def available_templates
-        get_templates
-      end
     end
   end
 end