diff --git a/jenkins_jobs/modules/properties.py b/jenkins_jobs/modules/properties.py
index 8f1a1b025..a3dded2c4 100644
--- a/jenkins_jobs/modules/properties.py
+++ b/jenkins_jobs/modules/properties.py
@@ -372,6 +372,7 @@ def inject(registry, xml_parent, data):
     :arg str script-file: file with script to run (optional)
     :arg str script-content: script to run (optional)
     :arg str groovy-content: groovy script to run (optional)
+    :arg bool groovy-sandbox: run groovy script in sandbox (default false)
     :arg bool load-from-master: load files from master (default false)
     :arg bool enabled: injection enabled (default true)
     :arg bool keep-system-variables: keep system variables (default true)
@@ -394,11 +395,29 @@ def inject(registry, xml_parent, data):
         ('properties-content', 'propertiesContent', None),
         ('script-file', 'scriptFilePath', None),
         ('script-content', 'scriptContent', None),
-        ('groovy-content', 'groovyScriptContent', None),
         ('load-from-master', 'loadFilesFromMaster', False),
     ]
     helpers.convert_mapping_to_xml(info, data, mapping, fail_required=False)
 
+    # determine version of plugin
+    plugin_info = registry.get_plugin_info("Groovy")
+    version = pkg_resources.parse_version(plugin_info.get('version', '0'))
+
+    if version >= pkg_resources.parse_version("2.0.0"):
+        secure_groovy_script = XML.SubElement(info, 'secureGroovyScript')
+        mapping = [
+            ('groovy-content', 'script', None),
+            ('groovy-sandbox', 'sandbox', False),
+        ]
+        helpers.convert_mapping_to_xml(secure_groovy_script, data, mapping,
+                            fail_required=False)
+    else:
+        mapping = [
+            ('groovy-content', 'groovyScriptContent', None),
+        ]
+        helpers.convert_mapping_to_xml(info, data, mapping,
+                            fail_required=False)
+
     mapping = [
         ('enabled', 'on', True),
         ('keep-system-variables', 'keepJenkinsSystemVariables', True),
diff --git a/tests/properties/fixtures/inject001.plugins_info.yaml b/tests/properties/fixtures/inject001.plugins_info.yaml
new file mode 100644
index 000000000..5010fa91f
--- /dev/null
+++ b/tests/properties/fixtures/inject001.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Groovy'
+  shortName: 'groovy'
+  version: "1.30"
diff --git a/tests/properties/fixtures/inject002.plugins_info.yaml b/tests/properties/fixtures/inject002.plugins_info.yaml
new file mode 100644
index 000000000..5010fa91f
--- /dev/null
+++ b/tests/properties/fixtures/inject002.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Groovy'
+  shortName: 'groovy'
+  version: "1.30"
diff --git a/tests/properties/fixtures/inject003.plugins_info.yaml b/tests/properties/fixtures/inject003.plugins_info.yaml
new file mode 100644
index 000000000..5010fa91f
--- /dev/null
+++ b/tests/properties/fixtures/inject003.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Groovy'
+  shortName: 'groovy'
+  version: "1.30"
diff --git a/tests/properties/fixtures/inject004.plugins_info.yaml b/tests/properties/fixtures/inject004.plugins_info.yaml
new file mode 100644
index 000000000..98b412566
--- /dev/null
+++ b/tests/properties/fixtures/inject004.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Groovy'
+  shortName: 'groovy'
+  version: "2.0"
diff --git a/tests/properties/fixtures/inject004.xml b/tests/properties/fixtures/inject004.xml
new file mode 100644
index 000000000..7d0793ff0
--- /dev/null
+++ b/tests/properties/fixtures/inject004.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <properties>
+    <EnvInjectJobProperty>
+      <info>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+        <secureGroovyScript>
+          <script>test groovy-content location 004</script>
+          <sandbox>true</sandbox>
+        </secureGroovyScript>
+      </info>
+      <on>true</on>
+      <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables>
+      <keepBuildVariables>true</keepBuildVariables>
+      <overrideBuildParameters>false</overrideBuildParameters>
+    </EnvInjectJobProperty>
+  </properties>
+</project>
diff --git a/tests/properties/fixtures/inject004.yaml b/tests/properties/fixtures/inject004.yaml
new file mode 100644
index 000000000..4c02e880e
--- /dev/null
+++ b/tests/properties/fixtures/inject004.yaml
@@ -0,0 +1,4 @@
+properties:
+  - inject:
+      groovy-content: test groovy-content location 004
+      groovy-sandbox: true
diff --git a/tests/properties/fixtures/inject005.plugins_info.yaml b/tests/properties/fixtures/inject005.plugins_info.yaml
new file mode 100644
index 000000000..5010fa91f
--- /dev/null
+++ b/tests/properties/fixtures/inject005.plugins_info.yaml
@@ -0,0 +1,3 @@
+- longName: 'Groovy'
+  shortName: 'groovy'
+  version: "1.30"
diff --git a/tests/properties/fixtures/inject005.xml b/tests/properties/fixtures/inject005.xml
new file mode 100644
index 000000000..262ec1f17
--- /dev/null
+++ b/tests/properties/fixtures/inject005.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project>
+  <properties>
+    <EnvInjectJobProperty>
+      <info>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+        <groovyScriptContent>test groovy-content location 005</groovyScriptContent>
+      </info>
+      <on>true</on>
+      <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables>
+      <keepBuildVariables>true</keepBuildVariables>
+      <overrideBuildParameters>false</overrideBuildParameters>
+    </EnvInjectJobProperty>
+  </properties>
+</project>
diff --git a/tests/properties/fixtures/inject005.yaml b/tests/properties/fixtures/inject005.yaml
new file mode 100644
index 000000000..6d55aa31e
--- /dev/null
+++ b/tests/properties/fixtures/inject005.yaml
@@ -0,0 +1,3 @@
+properties:
+  - inject:
+      groovy-content: test groovy-content location 005