diff --git a/boards/default/distros/fedora/Makefile b/boards/default/distros/fedora/Makefile
index f5e9bfd2..d05427c6 100644
--- a/boards/default/distros/fedora/Makefile
+++ b/boards/default/distros/fedora/Makefile
@@ -1,11 +1,11 @@
-RAWURL=http://fedora.riscv.rocks/kojifiles/work/tasks/944/320944/Fedora-Developer-Rawhide-20200108.n.0-sda.raw.xz
+RAWURL=https://dl.fedoraproject.org/pub/alt/risc-v/repo/virt-builder-images/images/Fedora-Minimal-Rawhide-20191123.n.1-sda.raw.xz
 COMPIMG=rootfs.img.xz
 NEWIMG=rootfs.img
 
 # Extract root partition without partition table
 # NOTE: Offset must be adjusted for different base image
 $(NEWIMG): $(COMPIMG)
-	xzcat -k $(COMPIMG) | dd of=$(NEWIMG) bs=512 skip=1007616
+	xzcat -k $(COMPIMG) | dd of=$(NEWIMG) bs=512 skip=1249280
 
 $(COMPIMG):
 	curl $(RAWURL) -o $(COMPIMG)
diff --git a/boards/firechip/base-workloads/fedora-base.json b/boards/firechip/base-workloads/fedora-base.json
index a54d29a4..bcb20347 100644
--- a/boards/firechip/base-workloads/fedora-base.json
+++ b/boards/firechip/base-workloads/fedora-base.json
@@ -1,5 +1,6 @@
 {
   "name" : "fedora-base",
+  "guest-init": "initRepos.sh",
   "distro" : {
       "name" : "fedora",
       "opts" : {}
diff --git a/boards/firechip/base-workloads/fedora-base/initRepos.sh b/boards/firechip/base-workloads/fedora-base/initRepos.sh
new file mode 100644
index 00000000..9d80627a
--- /dev/null
+++ b/boards/firechip/base-workloads/fedora-base/initRepos.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+dnf makecache
+poweroff