diff --git a/src/rest-server/src/models/v2/job/k8s.js b/src/rest-server/src/models/v2/job/k8s.js
index f35cd6cc0e..cd82828ae0 100644
--- a/src/rest-server/src/models/v2/job/k8s.js
+++ b/src/rest-server/src/models/v2/job/k8s.js
@@ -319,7 +319,9 @@ const generateTaskRole = (taskRole, labels, config) => {
         },
         spec: {
           privileged: false,
-          restartPolicy: 'Never',
+          // workaround for pending pods due to no ready sandbox before the fix
+          // https://github.com/kubernetes/kubernetes/commit/3fac48f8
+          restartPolicy: gangAllocation === 'true' ? 'Never' : 'OnFailure',
           serviceAccountName: 'frameworkbarrier-account',
           initContainers: [
             {