diff --git a/.github/workflows/openj9-test.yml b/.github/workflows/openj9-test.yml
new file mode 100644
index 0000000000..1d7a1eb6b7
--- /dev/null
+++ b/.github/workflows/openj9-test.yml
@@ -0,0 +1,11 @@
+name: OpenJ9 Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run OpenJ9 Test
+      run: sudo make -C scripts/ci openj9-test
diff --git a/.github/workflows/podman-test.yml b/.github/workflows/podman-test.yml
new file mode 100644
index 0000000000..447cbf0b69
--- /dev/null
+++ b/.github/workflows/podman-test.yml
@@ -0,0 +1,11 @@
+name: Podman Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run Podman Test
+      run: sudo make -C scripts/ci podman-test
diff --git a/.github/workflows/x86-64-clang-test.yml b/.github/workflows/x86-64-clang-test.yml
new file mode 100644
index 0000000000..e6e84ef524
--- /dev/null
+++ b/.github/workflows/x86-64-clang-test.yml
@@ -0,0 +1,11 @@
+name: X86_64 CLANG Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run X86_64 CLANG Test
+      run: sudo make -C scripts/ci x86_64 CLANG=1
diff --git a/.github/workflows/x86-64-gcc-test.yml b/.github/workflows/x86-64-gcc-test.yml
new file mode 100644
index 0000000000..b8b81ef15b
--- /dev/null
+++ b/.github/workflows/x86-64-gcc-test.yml
@@ -0,0 +1,11 @@
+name: X86_64 GCC Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run X86_64 GCC Test
+      run: sudo make -C scripts/ci x86_64
diff --git a/.travis.yml b/.travis.yml
index d6ee9a3990..fc95844b3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ env:
   - TR_ARCH=local       CLANG=1
   - TR_ARCH=local       COMPAT_TEST=y
   - TR_ARCH=local       CLANG=1 COMPAT_TEST=y
-  - TR_ARCH=x86_64
-  - TR_ARCH=x86_64      CLANG=1
-  - TR_ARCH=openj9-test
   - TR_ARCH=vagrant-fedora-no-vdso
 jobs:
   include:
@@ -57,10 +54,6 @@ jobs:
       arch: amd64
       env: TR_ARCH=fedora-rawhide
       dist: bionic
-    - os: linux
-      arch: amd64
-      env: TR_ARCH=podman-test
-      dist: bionic
     - os: linux
       arch: amd64
       env: TR_ARCH=docker-test
diff --git a/scripts/build/Dockerfile.tmpl b/scripts/build/Dockerfile.tmpl
index 2e02d902cc..0cb6de3db5 100644
--- a/scripts/build/Dockerfile.tmpl
+++ b/scripts/build/Dockerfile.tmpl
@@ -13,9 +13,11 @@ RUN apt-install \
 	git-core \
 	iptables \
 	libaio-dev \
+	libbsd-dev \
 	libcap-dev \
 	libgnutls28-dev \
 	libgnutls30 \
+	libnftables-dev \
 	libnl-3-dev \
 	libprotobuf-c-dev \
 	libprotobuf-dev \
diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index 7e93c8cc43..32fc2978a5 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:focal
 
 COPY scripts/ci/apt-install /bin/apt-install
 
diff --git a/scripts/ci/podman-test.sh b/scripts/ci/podman-test.sh
index f56d10a74f..d61e2d0b8d 100755
--- a/scripts/ci/podman-test.sh
+++ b/scripts/ci/podman-test.sh
@@ -1,13 +1,21 @@
 #!/bin/bash
 set -x -e -o pipefail
 
-echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+if [ ! -e /etc/lsb-release ]; then
+       # This expects to run on Ubuntu
+       exit 1
+fi
 
-wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_18.04/Release.key -O- | apt-key add -
+#shellcheck disable=SC1091
+. /etc/lsb-release
+
+echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${DISTRIB_RELEASE}/ /" > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+
+curl -sL "https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${DISTRIB_RELEASE}/Release.key" | apt-key add -
 
 # podman conflicts with a man page from docker-ce
 # this is a podman packaging bug (https://github.com/containers/libpod/issues/4747)
-apt-get -y purge docker-ce
+apt-get -y purge docker-ce || :
 
 ./apt-install \
     apt-transport-https \