diff --git a/README.md b/README.md
index 8fa84f737b..64600cffce 100644
--- a/README.md
+++ b/README.md
@@ -492,10 +492,12 @@ sam local invoke --docker-volume-basedir /c/Users/shlee322/projects/test "Rating
   - [x] `nodejs`
   - [x] `nodejs4.3`
   - [x] `nodejs6.10`
+  - [x] `nodejs8.10`
   - [x] `java8`
   - [x] `python2.7`
   - [x] `python3.6`
   - [ ] `dotnetcore1.0`
+  - [x] `dotnetcore2.0`
 * [x] AWS credential support 
 * [x] Debugging support
 * [x] Inline Swagger support within SAM templates
diff --git a/runtime.go b/runtime.go
index 54371bbe61..32b7d686a1 100644
--- a/runtime.go
+++ b/runtime.go
@@ -81,6 +81,7 @@ var runtimeName = struct {
 	nodejs       string
 	nodejs43     string
 	nodejs610    string
+	nodejs810    string
 	python27     string
 	python36     string
 	java8        string
@@ -90,6 +91,7 @@ var runtimeName = struct {
 	nodejs:       "nodejs",
 	nodejs43:     "nodejs4.3",
 	nodejs610:    "nodejs6.10",
+	nodejs810:    "nodejs8.10",
 	python27:     "python2.7",
 	python36:     "python3.6",
 	java8:        "java8",
@@ -101,6 +103,7 @@ var runtimeImageFor = map[string]string{
 	runtimeName.nodejs:       "lambci/lambda:nodejs",
 	runtimeName.nodejs43:     "lambci/lambda:nodejs4.3",
 	runtimeName.nodejs610:    "lambci/lambda:nodejs6.10",
+	runtimeName.nodejs810:    "lambci/lambda:nodejs8.10",
 	runtimeName.python27:     "lambci/lambda:python2.7",
 	runtimeName.python36:     "lambci/lambda:python3.6",
 	runtimeName.java8:        "lambci/lambda:java8",
@@ -502,6 +505,20 @@ func (r *Runtime) getDebugEntrypoint() (overrides []string) {
 			"--expose-gc",
 			"/var/runtime/node_modules/awslambda/index.js",
 		)
+	case runtimeName.nodejs810:
+		overrides = []string{
+			"/var/lang/bin/node",
+		}
+		overrides = append(overrides, debuggerArgsArray...)
+		overrides = append(overrides,
+			"--inspect="+r.DebugPort,
+			"--debug-brk",
+			"--nolazy",
+			"--expose-gc",
+			"--max-semi-space-size=150",
+			"--max-old-space-size=2707",
+			"/var/runtime/node_modules/awslambda/index.js",
+		)
 	case runtimeName.python27:
 		overrides = []string{
 			"/usr/bin/python2.7",