diff --git a/langs/base.go b/langs/base.go
index 47589d81..6c8c8900 100644
--- a/langs/base.go
+++ b/langs/base.go
@@ -29,6 +29,7 @@ func init() {
 
 	registerHelper(&GoLangHelper{Version: "1.15"})
 	// order matter, 'java' will pick up the first JavaLangHelper
+	registerHelper(&JavaLangHelper{version: "17"})
 	registerHelper(&JavaLangHelper{version: "11"})
 	registerHelper(&JavaLangHelper{version: "8"})
 	registerHelper(&NodeLangHelper{Version: "14"})
diff --git a/langs/java.go b/langs/java.go
index 371774f3..59b1ea21 100644
--- a/langs/java.go
+++ b/langs/java.go
@@ -66,6 +66,8 @@ func (h *JavaLangHelper) BuildFromImage() (string, error) {
 		return fmt.Sprintf("fnproject/fn-java-fdk-build:%s", fdkVersion), nil
 	} else if h.version == "11" {
 		return fmt.Sprintf("fnproject/fn-java-fdk-build:jdk11-%s", fdkVersion), nil
+	} else if h.version == "17" {
+		return fmt.Sprintf("fnproject/fn-java-fdk-build:jdk17-%s", fdkVersion), nil
 	} else {
 		return "", fmt.Errorf("unsupported java version %s", h.version)
 	}
@@ -81,6 +83,8 @@ func (h *JavaLangHelper) RunFromImage() (string, error) {
 		return fmt.Sprintf("fnproject/fn-java-fdk:%s", fdkVersion), nil
 	} else if h.version == "11" {
 		return fmt.Sprintf("fnproject/fn-java-fdk:jre11-%s", fdkVersion), nil
+	} else if h.version == "17" {
+		return fmt.Sprintf("fnproject/fn-java-fdk:jre17-%s", fdkVersion), nil
 	} else {
 		return "", fmt.Errorf("unsupported java version %s", h.version)
 	}