diff --git a/packages/kotlin/1.4.31/run b/packages/kotlin/1.4.31/run
index 8ecc073..e5713a3 100644
--- a/packages/kotlin/1.4.31/run
+++ b/packages/kotlin/1.4.31/run
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 
 # Run jar file
-shift
-java -jar code.jar "$@"
+java -jar code.jar
diff --git a/packages/python/3.10.0-alpha.7/metadata.json b/packages/python/3.10.0-alpha.7/metadata.json
index 5232a19..18c1722 100644
--- a/packages/python/3.10.0-alpha.7/metadata.json
+++ b/packages/python/3.10.0-alpha.7/metadata.json
@@ -1,5 +1,5 @@
 {
     "language": "python",
     "version": "3.10.0-alpha.7",
-    "aliases": ["py", "py3", "python3"]
+    "aliases": ["py", "python3"]
 }
diff --git a/packages/python/3.5.10/metadata.json b/packages/python/3.5.10/metadata.json
index 5cc61c1..fca2ef6 100644
--- a/packages/python/3.5.10/metadata.json
+++ b/packages/python/3.5.10/metadata.json
@@ -1,5 +1,5 @@
 {
     "language": "python",
     "version": "3.5.10",
-    "aliases": ["py", "py3", "python3"]
+    "aliases": ["py", "python3"]
 }
diff --git a/packages/python/3.9.1/metadata.json b/packages/python/3.9.1/metadata.json
index 2a0970f..5537b3e 100644
--- a/packages/python/3.9.1/metadata.json
+++ b/packages/python/3.9.1/metadata.json
@@ -1,5 +1,5 @@
 {
     "language": "python",
     "version": "3.9.1",
-    "aliases": ["py", "py3", "python3"]
+    "aliases": ["py", "python3"]
 }
diff --git a/packages/python/3.9.4/metadata.json b/packages/python/3.9.4/metadata.json
index 63f96dc..b49acc9 100644
--- a/packages/python/3.9.4/metadata.json
+++ b/packages/python/3.9.4/metadata.json
@@ -1,5 +1,5 @@
 {
     "language": "python",
     "version": "3.9.4",
-    "aliases": ["py", "py3", "python3"]
+    "aliases": ["py", "python3"]
 }
diff --git a/packages/scala/3.0.0/build.sh b/packages/scala/3.0.0/build.sh
index 4cbf363..0a3fcf7 100755
--- a/packages/scala/3.0.0/build.sh
+++ b/packages/scala/3.0.0/build.sh
@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
 
-# Download and extract JDK8
-curl -L "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz" -o jdk.tar.gz
-tar xzf jdk.tar.gz --strip-components=1
-rm jdk.tar.gz
+# Scala depends on Java
+mkdir -p java
+cd java
+curl "https://download.java.net/java/GA/jdk15.0.2/0d1cfde4252546c6931946de8db48ee2/7/GPL/openjdk-15.0.2_linux-x64_bin.tar.gz" -o java.tar.gz
+tar xzf java.tar.gz --strip-components=1
+rm java.tar.gz
+cd ..
 
-# Download and extract Scala 3
-curl -L "https://github.com/lampepfl/dotty/releases/download/3.0.0/scala3-3.0.0.tar.gz" -o scala.tar.gz
+mkdir -p scala
+cd scala
+curl -L "https://github.com/lampepfl/dotty/releases/download/3.0.0-RC1/scala3-3.0.0-RC1.tar.gz" -o scala.tar.gz
 tar -xzf scala.tar.gz --strip-components=1
 rm scala.tar.gz
+cd ..
diff --git a/packages/scala/3.0.0/compile b/packages/scala/3.0.0/compile
deleted file mode 100644
index 25853ef..0000000
--- a/packages/scala/3.0.0/compile
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-# Compile scala classes into a jar file
-scalac "$@" -d out.jar
-
-# Create the Manifest and include scala lib jars:
-# NOTE: - entry point will only consider @main and App traits from the main file
-#       - scala lib jars will be added to the class path in order to run the jar properly
-echo "Main-Class: $(grep -oP '\@main\s+def\s+\K[a-zA-Z][a-zA-Z0-9]*|object\s+\K[a-zA-Z][a-zA-Z0-9]*(?=\s+extends\s+App)' $1)
-Class-Path:  $(echo $JAVA_HOME/lib/*.jar | sed 's/\s/\n  /g')
-
-" > manifest.txt
-
-# Update the jar with the manifest
-jar ufm out.jar manifest.txt
diff --git a/packages/scala/3.0.0/environment b/packages/scala/3.0.0/environment
index a1fcafe..40244a6 100644
--- a/packages/scala/3.0.0/environment
+++ b/packages/scala/3.0.0/environment
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 # Scala requires JAVA_HOME to be set
-export JAVA_HOME=$PWD
-export PATH=$PWD/bin:$PATH
+export JAVA_HOME=$PWD/java
+export PATH=$PWD/scala/bin:$PATH
diff --git a/packages/scala/3.0.0/metadata.json b/packages/scala/3.0.0/metadata.json
index 37bccf8..8c2e7b4 100644
--- a/packages/scala/3.0.0/metadata.json
+++ b/packages/scala/3.0.0/metadata.json
@@ -1,5 +1,5 @@
 {
     "language": "scala",
     "version": "3.0.0",
-    "aliases": ["sc"]
+    "aliases": ["scala", "sc"]
 }
diff --git a/packages/scala/3.0.0/run b/packages/scala/3.0.0/run
index afcc045..1d92acc 100644
--- a/packages/scala/3.0.0/run
+++ b/packages/scala/3.0.0/run
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
-# Run jar file
+# Put instructions to run the runtime
+mv $1 $1.scala
+filename=$1.scala
 shift
-java -jar out.jar "$@"
+scala $filename "$@"