diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6bb0eddc5..848576811 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,6 @@ jobs:
         ]
         riscv_libc: [
           "",
-          "picolibc",
           "segger",
         ]
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5860d87e1..e896e9a29 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,7 +3,6 @@ FROM ubuntu:16.04 AS download-tarballs
 ARG SIFIVE_TOOLS_URL=https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.08
 
 ARG RISCV_TOOLS_TARBALL=riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14.tar.gz
-ARG RISCV_PICOLIBC_TARBALL=riscv64-unknown-elf-picolibc-1.4.6-2020.08.2-x86_64-linux-ubuntu14.tar.gz
 ARG RISCV_SEGGER_LIBC_TARBALL=segger_libc-2020.08.2.tar.bz2
 ARG QEMU_TARBALL=riscv-qemu-5.1.0-2020.08.1-x86_64-linux-ubuntu14.tar.gz
 
@@ -14,10 +13,6 @@ RUN apt-get update && \
     rsync \
     wget
 
-# Install picolibc
-RUN wget --no-verbose https://github.com/picolibc/picolibc/releases/download/1.4.6/${RISCV_PICOLIBC_TARBALL} && \
-    tar xzf ${RISCV_PICOLIBC_TARBALL}
-
 # Install RISC-V Toolchain
 RUN wget --no-verbose ${SIFIVE_TOOLS_URL}/${RISCV_TOOLS_TARBALL} && \
     tar xzf ${RISCV_TOOLS_TARBALL} && \
diff --git a/freedom-metal b/freedom-metal
index 4afda0c60..58f40ee37 160000
--- a/freedom-metal
+++ b/freedom-metal
@@ -1 +1 @@
-Subproject commit 4afda0c6036346ca64a88d5501dd2758c8b12cdd
+Subproject commit 58f40ee376f85998eabbe9e35654b74e1807e03e
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index ba5daf897..8278f0816 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -62,12 +62,6 @@ METAL_WITH_EXTRA=--with-builtin-libgloss
 SPEC=nano
 endif
 
-ifeq ($(RISCV_LIBC),picolibc)
-LIBMETAL_EXTRA=-lmetal-pico
-METAL_WITH_EXTRA=--with-builtin-libmetal-pico
-SPEC=picolibc
-endif
-
 ifeq ($(SPEC),)
 $(error RISCV_LIBC set to an unsupported value: $(RISCV_LIBC))
 endif
@@ -275,7 +269,6 @@ PROGRAM_SRCS = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*.h) $(wildcard
 $(PROGRAM_ELF): \
 		$(PROGRAM_SRCS) \
 		$(BSP_DIR)/install/lib/$(CONFIGURATION)/libmetal.a \
-		$(BSP_DIR)/install/lib/$(CONFIGURATION)/libmetal-pico.a \
 		$(BSP_DIR)/install/lib/$(CONFIGURATION)/libmetal-gloss.a \
 		$(BSP_DIR)/metal.$(LINK_TARGET).lds
 	mkdir -p $(dir $@)
diff --git a/wit-manifest.json b/wit-manifest.json
index 6421a3cda..f3b1f7d23 100644
--- a/wit-manifest.json
+++ b/wit-manifest.json
@@ -5,7 +5,7 @@
         "source": "git@github.com:sifive/freedom-devicetree-tools.git"
     },
     {
-        "commit": "4afda0c6036346ca64a88d5501dd2758c8b12cdd",
+        "commit": "58f40ee376f85998eabbe9e35654b74e1807e03e",
         "name": "freedom-metal",
         "source": "git@github.com:sifive/freedom-metal.git"
     },