diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
index a0788437..7d916046 100644
--- a/.github/workflows/toolchain.yml
+++ b/.github/workflows/toolchain.yml
@@ -56,7 +56,8 @@ jobs:
           URL=https://github.com/${GITHUB_REPOSITORY}/releases/download/${TAG_NAME}/${GCC}.tgz
           echo ${URL}
           if ! wget --spider ${URL} 2> /dev/null; then
-            sed -i "s|EXTERNAL=y|EXTERNAL=n|g" ${CONFIG}
+            sed -i "/BR2_TOOLCHAIN_EXTERNAL.*/d" ${CONFIG}
+            echo BR2_PACKAGE_AWS_WEBRTC=y >> ${CONFIG}
             make BOARD=${CONFIG} br-sdk
             SDK=$(find output/images -name *_sdk-buildroot.tar.gz)
             mv ${SDK} ${GCC}.tgz
diff --git a/Makefile b/Makefile
index a853cd22..47e8cddb 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ toolname:
 	@general/scripts/show_toolchains.sh $(CONFIG)
 
 package:
-	@find general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patches
+	@find general/package/* -maxdepth 0 -type d -printf "br-%f\n" | grep -v patch
 
 clean:
 	@rm -rf $(TARGET)/images $(TARGET)/target
diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk
index f78aea2d..0cb3b670 100644
--- a/general/package/aws-producer/aws-producer.mk
+++ b/general/package/aws-producer/aws-producer.mk
@@ -4,14 +4,9 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
 AWS_PRODUCER_SITE_METHOD = git
 AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c
 AWS_PRODUCER_VERSION = $(shell git ls-remote $(AWS_PRODUCER_SITE) HEAD | head -1 | cut -f1)
-else
-AWS_PRODUCER_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-producer-c/archive
-AWS_PRODUCER_SOURCE = master.tar.gz
-endif
 
 AWS_PRODUCER_INSTALL_STAGING = YES
 AWS_PRODUCER_LICENSE = Apache-2.0
diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk
index 4b0eb73d..e4328b71 100644
--- a/general/package/aws-webrtc/aws-webrtc.mk
+++ b/general/package/aws-webrtc/aws-webrtc.mk
@@ -4,14 +4,9 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
 AWS_WEBRTC_SITE_METHOD = git
 AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c
 AWS_WEBRTC_VERSION = $(shell git ls-remote $(AWS_WEBRTC_SITE) develop | head -1 | cut -f1)
-else
-AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c/archive
-AWS_WEBRTC_SOURCE = develop.tar.gz
-endif
 
 AWS_WEBRTC_INSTALL_STAGING = YES
 AWS_WEBRTC_LICENSE = Apache-2.0
diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk
index 81e561af..fc7a15bb 100644
--- a/general/package/libsrtp-openipc/libsrtp-openipc.mk
+++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk
@@ -4,16 +4,13 @@
 #
 ################################################################################
 
-ifeq ($(LOCAL_DOWNLOAD),y)
 LIBSRTP_OPENIPC_SITE_METHOD = git
 LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp
 LIBSRTP_OPENIPC_VERSION = $(shell git ls-remote $(LIBSRTP_OPENIPC_SITE) HEAD | head -1 | cut -f1)
-else
-LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp/archive
-LIBSRTP_OPENIPC_SOURCE = master.tar.gz
-endif
 
 LIBSRTP_OPENIPC_INSTALL_STAGING = YES
+LIBSRTP_OPENIPC_SUPPORTS_IN_SOURCE_BUILD = NO
+
 LIBSRTP_OPENIPC_LICENSE = BSD-3-Clause
 LIBSRTP_OPENIPC_LICENSE_FILES = LICENSE
 LIBSRTP_OPENIPC_CPE_ID_VENDOR = cisco