diff --git a/k8s/yamls/qa-toolset-bare.yaml b/k8s/yamls/qa-toolset-bare.yaml
new file mode 100644
index 0000000..146dee9
--- /dev/null
+++ b/k8s/yamls/qa-toolset-bare.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: toolset
+  namespace: qa-space
+spec:
+  containers:
+  - command:
+    - /bin/sleep
+    - infinity
+    imagePullPolicy: IfNotPresent
+    name: toolset
+    image: savex13/toolset:latest
+  dnsPolicy: ClusterFirst
+  volumes:
+  - emptyDir: {}
+    name: pod-tmp
diff --git a/k8s/yamls/qa-ubuntu.yaml b/k8s/yamls/qa-toolset.yaml
similarity index 97%
rename from k8s/yamls/qa-ubuntu.yaml
rename to k8s/yamls/qa-toolset.yaml
index d3f3541..5a53ba3 100644
--- a/k8s/yamls/qa-ubuntu.yaml
+++ b/k8s/yamls/qa-toolset.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: ubuntu
+  name: toolset
   namespace: qa-space
 spec:
   containers:
@@ -64,7 +64,7 @@
           key: OS_DEFAULT_DOMAIN
           name: keystone-keystone-admin
     imagePullPolicy: IfNotPresent
-    name: ubuntu
+    name: toolset
     #image: 127.0.0.1:44301/general/external/docker.io/library/ubuntu:bionic-20201119
     image: savex13/toolset:latest
     volumeMounts:
diff --git a/k8s/yamls/toolset.yaml b/k8s/yamls/toolset.yaml
deleted file mode 100644
index 6c2df64..0000000
--- a/k8s/yamls/toolset.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: toolset
-  namespace: qa-space
-spec:
-  containers:
-  - command:
-    - /bin/sleep
-    - infinity
-    env:
-    - name: LANG
-      value: C.UTF-8
-    - name: OS_IDENTITY_API_VERSION
-      value: "3"
-    - name: OS_AUTH_URL
-      valueFrom:
-        secretKeyRef:
-          key: OS_AUTH_URL
-          name: keystone-keystone-admin
-    - name: OS_REGION_NAME
-      valueFrom:
-        secretKeyRef:
-          key: OS_REGION_NAME
-          name: keystone-keystone-admin
-    - name: OS_INTERFACE
-      valueFrom:
-        secretKeyRef:
-          key: OS_INTERFACE
-          name: keystone-keystone-admin
-    - name: OS_ENDPOINT_TYPE
-      valueFrom:
-        secretKeyRef:
-          key: OS_INTERFACE
-          name: keystone-keystone-admin
-    - name: OS_PROJECT_DOMAIN_NAME
-      valueFrom:
-        secretKeyRef:
-          key: OS_PROJECT_DOMAIN_NAME
-          name: keystone-keystone-admin
-    - name: OS_PROJECT_NAME
-      valueFrom:
-        secretKeyRef:
-          key: OS_PROJECT_NAME
-          name: keystone-keystone-admin
-    - name: OS_USER_DOMAIN_NAME
-      valueFrom:
-        secretKeyRef:
-          key: OS_USER_DOMAIN_NAME
-          name: keystone-keystone-admin
-    - name: OS_USERNAME
-      valueFrom:
-        secretKeyRef:
-          key: OS_USERNAME
-          name: keystone-keystone-admin
-    - name: OS_PASSWORD
-      valueFrom:
-        secretKeyRef:
-          key: OS_PASSWORD
-          name: keystone-keystone-admin
-    - name: OS_DEFAULT_DOMAIN
-      valueFrom:
-        secretKeyRef:
-          key: OS_DEFAULT_DOMAIN
-          name: keystone-keystone-admin
-    imagePullPolicy: IfNotPresent
-    name: toolset
-    image: savex13/toolset:0.4
-    volumeMounts:
-    - mountPath: /artifacts
-      name: qa-pv-a
-  dnsPolicy: ClusterFirst
-  volumes:
-  - emptyDir: {}
-    name: pod-tmp
-  - name: qa-pv-a
-    persistentVolumeClaim:
-      claimName: qa-pvc-a