diff --git a/.devfile.yaml b/.devfile.yaml
new file mode 100644
index 0000000000..14ab311579
--- /dev/null
+++ b/.devfile.yaml
@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2019-2021 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Red Hat, Inc. - initial API and implementation
+#
+schemaVersion: 2.2.0
+metadata:
+  name: devspaces-images
+# add components:, unless basic udi component is good enough?
+components:
+  - name: tools
+    container:
+      image: quay.io/mkuznets/devspaces-images-tools:latest
+      memoryRequest: 1Gi
+      memoryLimit: 8Gi
+      cpuLimit: '4'
+      cpuRequest: '0.5'
+      env:
+        - 
+          name: http_proxy
+          value: socks5h://localhost:9999
+        - 
+          name: https_proxy
+          value: socks5h://localhost:9999
+        - 
+          name: ftp_proxy
+          value: socks5h://localhost:9999
+        - 
+          name: rsync_proxy
+          value: socks5h://localhost:9999
+        - 
+          name: all_proxy
+          value: socks5h://localhost:9999
+        - 
+          name: HTTP_PROXY
+          value: socks5h://localhost:9999
+        - 
+          name: HTTPS_PROXY
+          value: socks5h://localhost:9999
+        - 
+          name: FTPS_PROXY
+          value: socks5h://localhost:9999
+        - 
+          name: RSYNC_PROXY
+          value: socks5h://localhost:9999
+        - 
+          name: ALL_PROXY
+          value: socks5h://localhost:9999
+        - 
+          name: NO_PROXY
+          value: socks5h://localhost:9999
+      
+# add commands: for building all of the containers?
+commands:
+  - id: start-socks5-proxy
+    exec:
+      commandLine: |
+        read -p "ENTER Red Hat username: " REDHAT_USER &&
+        ssh -D 9999 ${REDHAT_USER}@bastion-rdu2.redhat.com -p 330
+
+      component: tools
+      label: Connect to Red Hat internal network
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000000..4f073a9633
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,13 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "devfile",
+			"command": "read -p \"ENTER Red Hat username: \" REDHAT_USER &&\nssh -D 9999 ${REDHAT_USER}@bastion-rdu2.redhat.com -p 330\n",
+			"workdir": "${PROJECT_SOURCE}",
+			"component": "tools",
+			"problemMatcher": [],
+			"label": "devfile: Connect to Red Hat internal network"
+		}
+	]
+}
\ No newline at end of file
diff --git a/devfile.yaml b/devfile.yaml
deleted file mode 100644
index dcd36056af..0000000000
--- a/devfile.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2019-2021 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-schemaVersion: 2.2.0
-metadata:
-  name: devspaces-images
-# add components:, unless basic udi component is good enough?
-# add commands: for building all of the containers?