diff --git a/create-workspace.py b/create-workspace.py
index 197a2b3e..006a33be 100755
--- a/create-workspace.py
+++ b/create-workspace.py
@@ -455,11 +455,10 @@ def create_container_env(
 
 def main():
     args = parser.parse_args()
-
     default_orchestrator = 'docker'
 
     # Check some programs in advance
-    if args.environment == 'virtualenv':
+    if args.environment == 'virtualenv' and not args.do_not_compile_templates:
         available = check_programs([
             'podman', 'docker'
         ], available=True)
@@ -469,7 +468,8 @@ def main():
                 default_orchestrator = orchestrator
                 break
     else:
-        default_orchestrator = args.environment
+        if args.environment != "virtualenv":
+            default_orchestrator = args.environment
 
     required_programs = {'git'}
     required_modules = set()
@@ -488,14 +488,13 @@ def main():
             'Warning! You have chosen persistent images. '
             'This known to have problems with podman + fuse-overlayfs'
         )
-
-    if args.environment == 'virtualenv':
-        required_modules.add('virtualenv')
-        required_programs.add(default_orchestrator)
-    else:
-        required_programs.add(args.environment)
-
+    
     if not args.do_not_compile_templates:
+        if args.environment == 'virtualenv':
+            required_programs.add(default_orchestrator)
+        else:
+            required_programs.add(args.environment)
+
         required_abis.add('vsyscall32')
         required_programs.add(default_orchestrator)
 
diff --git a/pupy/pupylib/PupyCredentials.py b/pupy/pupylib/PupyCredentials.py
index 6a4f3537..0cd3d981 100644
--- a/pupy/pupylib/PupyCredentials.py
+++ b/pupy/pupylib/PupyCredentials.py
@@ -224,7 +224,7 @@ def _generate_ssl_ca():
     cert.set_issuer(cert.get_subject())
     cert.set_pubkey(pk)
     cert.add_ext(X509.new_extension('basicConstraints', 'CA:TRUE'))
-    cert.add_ext(X509.new_extension('subjectKeyIdentifier', str(cert.get_fingerprint())))
+    #cert.add_ext(X509.new_extension('subjectKeyIdentifier', str(cert.get_fingerprint())))
     cert.sign(pk, 'sha256')
 
     return pk.as_pem(cipher=None), cert.as_pem(), pk, cert
@@ -250,7 +250,7 @@ def _generate_ssl_keypair(rsa_key, ca_key, ca_cert, role='CONTROL', client=False
     cert.set_issuer(ca_cert.get_subject())
     cert.set_pubkey(pk)
     cert.add_ext(X509.new_extension('basicConstraints', 'critical,CA:FALSE'))
-    cert.add_ext(X509.new_extension('subjectKeyIdentifier', str(cert.get_fingerprint())))
+    #cert.add_ext(X509.new_extension('subjectKeyIdentifier', str(cert.get_fingerprint())))
     if client:
         cert.add_ext(X509.new_extension('keyUsage', 'critical,digitalSignature'))
         cert.add_ext(X509.new_extension('nsCertType', 'client'))
@@ -350,8 +350,8 @@ def _generate_apk_keypair():
     cert.set_not_after(expire)
     cert.set_pubkey(pk)
     cert.set_issuer(cert.get_subject())
-    cert.add_ext(X509.new_extension(
-        'subjectKeyIdentifier', str(cert.get_fingerprint())))
+    #cert.add_ext(X509.new_extension(
+    #    'subjectKeyIdentifier', str(cert.get_fingerprint())))
     cert.sign(pk, 'sha256')
 
     return {
diff --git a/pupy/requirements.txt b/pupy/requirements.txt
index 6e516f69..dbd513b3 100644
--- a/pupy/requirements.txt
+++ b/pupy/requirements.txt
@@ -1,49 +1,97 @@
-pycryptodome
-pefile 
-pyyaml
-rsa==4.0
-netaddr
+backports-abc==0.5
+Cerberus==1.3.2
+certifi==2020.12.5
+cffi==1.14.4
+chardet==4.0.0
+click==7.1.2
+colorama==0.4.4
+configparser==4.0.2
+contextlib2==0.6.0.post1
+cryptography==3.3.1
+Cython==0.25.2
+dateparser==0.7.6
+defusedxml==0.6.0
+dnslib==0.9.14
+dnspython==1.16.0
+dukpy==0.2.3
 ecdsa==0.13
-paramiko==2.0.2
-https://github.com/alxchk/tinyec/archive/master.zip
-psutil
-netifaces
-pylzma
-colorama
+enum34==1.1.10
+filemagic==1.6
+flake8==3.8.4
+flake8-per-file-ignores==0.8.1
+Flask==1.1.2
+functools32==3.2.3.post2
+fusepy==3.0.1
+future==0.18.2
+futures==3.3.0
+hexdump==3.3
+http-request==1.2
+idna==2.10
+impacket==0.9.22
+importlib-metadata==2.1.1
+importlib-resources==3.3.1
+ipaddress==1.0.23
+itsdangerous==1.1.0
+Jinja2==2.11.2
+keyboard==0.13.4
+ldap3==2.8.1
+ldapdomaindump==0.9.3
+logutils==0.3.5
+M2Crypto
+MarkupSafe==1.1.1
+mccabe==0.6.1
+msgpack==0.6.2
 mss==4.0.3
-pyOpenSSL
-scapy
-impacket
-pyuv
-dnslib
+netaddr==0.8.0
+netifaces==0.10.9
+paramiko==2.0.2
+pathlib2==2.3.5
+pathmatch==0.2.2
+pefile==2019.4.18
+pip==20.3.3
+poster==0.8.1
+psutil==5.8.0
+puttykeys==1.0.2
+pyaes==1.6.1
+pyasn1==0.4.8
+pycodestyle==2.6.0
+pycparser==2.20
+pycryptodome==3.9.9
+pycryptodomex==3.9.9
+pyelftools==0.27
+pyflakes==2.2.0
+Pygments==2.5.2
+pylzma==0.5.0
+pyOpenSSL==20.0.1
+python-dateutil==2.8.1
+pytz==2020.5
+pyuv==1.4.0
+PyYAML==5.4.1
+regex==2020.11.13
+requests==2.25.1
+rsa==4.5
+scandir==1.10.0
+scapy==2.4.4
+SecretStorage==2.3.1
+setuptools==44.1.1
+singledispatch==3.4.0.3
+six==1.15.0
+tornado==5.1.1
+typing==3.7.4.3
+tzlocal==2.1
+urllib3==1.26.2
+Werkzeug==1.0.1
+wheel==0.36.2
+win-inet-pton==1.1.0
+xattr==0.9.7
+zipp==1.2.0
+https://github.com/alxchk/tinyec/archive/master.zip
 https://github.com/benoitc/http-parser/archive/master.zip
-cerberus
-logutils
+cerberus==1.3.2
 secretstorage==2.3.1
 https://github.com/AlessandroZ/pypykatz/archive/master.zip
 https://github.com/warner/python-ed25519/archive/master.zip
-pygments
-requests
 tornado==v5.1.1
-poster
-win_inet_pton
-scandir
 msgpack==0.6.2
-hexdump
-M2Crypto>=0.30.1
-fusepy
-defusedxml
-keyboard==0.13.4
-dateparser
-puttykeys
-pyelftools
-filemagic
-xattr
-dukpy
-pyaes
-chardet
 https://github.com/alxchk/urllib-auth/archive/master.zip
 https://github.com/alxchk/pykcp/archive/master.zip
-http_request
-flake8
-flake8-per-file-ignores