diff --git a/hardware/virtualization/containerd/pspec.xml b/hardware/virtualization/containerd/pspec.xml
index 4126bb6230..eb754b5e64 100644
--- a/hardware/virtualization/containerd/pspec.xml
+++ b/hardware/virtualization/containerd/pspec.xml
@@ -13,7 +13,7 @@
         <Description>is a daemon with an API and a command line client, to manage containers on one machine. It uses runC to run containers according to the OCI specification.</Description>
         <Archive sha1sum="4e976a4365c44a30f89aeae4d31b00eca914bfb5" type="targz">https://github.com/containerd/containerd/archive/v1.1.0.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency>golang</Dependency>
+            <Dependency versionFrom="1.10.3">golang</Dependency>
             <Dependency>git</Dependency>
             <Dependency>libseccomp-devel</Dependency>
             <Dependency>btrfs-progs-devel</Dependency>
diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml
index 4e79c743c5..b70767de2a 100644
--- a/hardware/virtualization/docker/pspec.xml
+++ b/hardware/virtualization/docker/pspec.xml
@@ -16,7 +16,7 @@
         <Archive sha1sum="089556da40a9438d963cca9bf8ddfc6800d5c619" type="targz">https://github.com/docker/docker-ce/archive/v18.05.0-ce.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
-            <Dependency versionFrom="1.6.2">golang</Dependency>
+            <Dependency versionFrom="1.10.3">golang</Dependency>
             <Dependency>btrfs-progs-devel</Dependency>
             <Dependency>device-mapper-devel</Dependency>
             <Dependency>sqlite-devel</Dependency>
diff --git a/hardware/virtualization/runc/actions.py b/hardware/virtualization/runc/actions.py
index 8e852353bc..593de8ff6b 100644
--- a/hardware/virtualization/runc/actions.py
+++ b/hardware/virtualization/runc/actions.py
@@ -10,12 +10,29 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
-shelltools.export("GOPATH", "%s" % get.workDIR())
+#shelltools.export("GOPATH", "%s" % get.curDIR())
 shelltools.export("DOCKER_BUILDTAGS","seccomp")
+shelltools.export("COMMIT","4fc53a8")
 shelltools.export("BINDIR","/usr/bin")
 
+def setup():
+    shelltools.cd("%s" % get.workDIR())
+    shelltools.move("runc-*", "runc")
+    
+    shelltools.cd("runc")
+    shelltools.move("vendor", "src")
+    
+    shelltools.makedirs("src/github.com/opencontainers")
+    shelltools.cd("src/github.com/opencontainers")
+    
+    shelltools.system("ln -rsf %s/runc ./runc" % get.workDIR())
+    
 def build():
-    autotools.make()
+    shelltools.cd("%s/runc/src/github.com/opencontainers/runc" % get.workDIR())
+    
+    build_runc = "GOPATH=%s/runc make COMMIT=4fc53a8" % get.workDIR()
+
+    shelltools.system(build_runc)
 
 def install():
     pisitools.dobin("runc")
diff --git a/hardware/virtualization/runc/pspec.xml b/hardware/virtualization/runc/pspec.xml
index 3e52cfdab7..9aebf91a54 100644
--- a/hardware/virtualization/runc/pspec.xml
+++ b/hardware/virtualization/runc/pspec.xml
@@ -13,7 +13,7 @@
         <Description>CLI tool for managing OCI compliant containers</Description>
         <Archive sha1sum="dcc87b404034fff66f9d4c4e2983f3483157ad71" type="targz">https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency>golang</Dependency>
+            <Dependency versionFrom="1.10.3">golang</Dependency>
             <Dependency>libseccomp-devel</Dependency>
         </BuildDependencies>
     </Source>