diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..b0e78cc9
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,22 @@
+{
+    "name": "TRA Analysis Development Environment",
+    "build": {
+		"dockerfile": "../analysis-master/analysis-amd64/docker/Dockerfile-vscode",
+    },
+    "settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"python.pythonPath": "/usr/local/bin/python",
+		"python.linting.enabled": true,
+		"python.linting.pylintEnabled": true,
+		"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+		"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
+		"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
+		"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
+		"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
+		"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
+		"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
+		"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
+		"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint",
+		"python.testing.pytestPath": "/usr/local/py-utils/bin/pytest"
+	},
+}
\ No newline at end of file
diff --git a/analysis-master/analysis-amd64/build.sh b/analysis-master/analysis-amd64/build.sh
index c6ac05d8..de0cce90 100644
--- a/analysis-master/analysis-amd64/build.sh
+++ b/analysis-master/analysis-amd64/build.sh
@@ -1 +1 @@
-python3 setup.py sdist bdist_wheel
\ No newline at end of file
+python setup.py sdist bdist_wheel || python3 setup.py sdist bdist_wheel
\ No newline at end of file
diff --git a/analysis-master/analysis-amd64/Dockerfile b/analysis-master/analysis-amd64/docker/Dockerfile
similarity index 60%
rename from analysis-master/analysis-amd64/Dockerfile
rename to analysis-master/analysis-amd64/docker/Dockerfile
index 10864dd2..b89cc8f2 100644
--- a/analysis-master/analysis-amd64/Dockerfile
+++ b/analysis-master/analysis-amd64/docker/Dockerfile
@@ -1,4 +1,3 @@
 FROM python
 WORKDIR ~/
-COPY . .
-RUN cd
\ No newline at end of file
+COPY .. .
\ No newline at end of file
diff --git a/analysis-master/analysis-amd64/docker/Dockerfile-vscode b/analysis-master/analysis-amd64/docker/Dockerfile-vscode
new file mode 100644
index 00000000..d1d6748c
--- /dev/null
+++ b/analysis-master/analysis-amd64/docker/Dockerfile-vscode
@@ -0,0 +1,3 @@
+FROM python
+WORKDIR ~/
+# COPY . .
\ No newline at end of file