diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 9ee86d71a..716177d1e 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -153,9 +153,9 @@ builder_go_tag: v2.1.0
 
 #s2i
 s2ioperator_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/s2ioperator"
-s2ioperator_tag: "latest"
+s2ioperator_tag: "v3.1.0"
 s2irun_repo: "{{ base_repo }}{{ namespace_override | default('kubespheredev') }}/s2irun"
-s2irun_tag: "latest"
+s2irun_tag: "release-2.1"
 
 s2itemplates_tag: v2.1.0
 binary_repo: "{{ base_repo }}{{ namespace_override | default('kubesphere') }}/s2i-binary"
diff --git a/roles/ks-devops/s2i/templates/s2ioperator.yaml.j2 b/roles/ks-devops/s2i/templates/s2ioperator.yaml.j2
index 852976b1f..8766f00e3 100644
--- a/roles/ks-devops/s2i/templates/s2ioperator.yaml.j2
+++ b/roles/ks-devops/s2i/templates/s2ioperator.yaml.j2
@@ -442,7 +442,7 @@ spec:
         - name: S2IIMAGENAME
           value: "{{ s2irun_repo }}:{{ s2irun_tag }}"
         image: "{{ s2ioperator_repo }}:{{ s2ioperator_tag }}"
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         name: manager
         ports:
         - containerPort: 8080