diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index e1f18459071..94f702274c9 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -238,7 +238,7 @@ $(eval $(call SetupExecute, create_$(JMOD_FILE), \
     PRE_COMMAND := $(RM) $(JMODS_DIR)/$(JMOD_FILE) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
     COMMAND := $(JMOD) create --module-version $(VERSION_SHORT) \
         --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
-        --module-path $(JMODS_DIR) $(JMOD_FLAGS) \
+        --module-path $(JMODS_DIR) $(JMOD_FLAGS) -J-Djdk.nativeCrypto=false \
         $(JMOD_SOURCE_DATE) \
         $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
     POST_COMMAND := $(MV) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE) $(JMODS_DIR)/$(JMOD_FILE), \
diff --git a/make/Images.gmk b/make/Images.gmk
index 841ccef7637..fead410b518 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -70,7 +70,7 @@ JLINK_ORDER_RESOURCES += \
     /jdk.localedata/** \
     #
 
-JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
+JLINK_TOOL := $(JLINK) -J-Djdk.nativeCrypto=false -J-Djlink.debug=true \
     --module-path $(IMAGES_OUTPUTDIR)/jmods \
     --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
     --release-info $(BASE_RELEASE_FILE) \