diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java
index 2941c6cd23..1e65900ee1 100644
--- a/src/main/java/org/kohsuke/github/GHPerson.java
+++ b/src/main/java/org/kohsuke/github/GHPerson.java
@@ -154,10 +154,7 @@ public List<GHRepository> next() {
      */
     public GHRepository getRepository(String name) throws IOException {
         try {
-            return root.createRequest()
-                    .withUrlPath("/repos/" + login + '/' + name)
-                    .fetch(GHRepository.class)
-                    .wrap(root);
+            return GHRepository.read(root, login, name);
         } catch (FileNotFoundException e) {
             return null;
         }
diff --git a/src/main/java/org/kohsuke/github/GHProject.java b/src/main/java/org/kohsuke/github/GHProject.java
index 09508fa4c0..c93fdad476 100644
--- a/src/main/java/org/kohsuke/github/GHProject.java
+++ b/src/main/java/org/kohsuke/github/GHProject.java
@@ -80,10 +80,8 @@ public GHObject getOwner() throws IOException {
                 } else if (owner_url.contains("/users/")) {
                     owner = root.createRequest().withUrlPath(getOwnerUrl().getPath()).fetch(GHUser.class).wrapUp(root);
                 } else if (owner_url.contains("/repos/")) {
-                    owner = root.createRequest()
-                            .withUrlPath(getOwnerUrl().getPath())
-                            .fetch(GHRepository.class)
-                            .wrap(root);
+                    String[] pathElements = getOwnerUrl().getPath().split("/");
+                    owner = GHRepository.read(root, pathElements[1], pathElements[2]);
                 }
             } catch (FileNotFoundException e) {
                 return null;
diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java
index b4e056cac8..58b36ecb85 100644
--- a/src/main/java/org/kohsuke/github/GHRepository.java
+++ b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -111,6 +111,12 @@ public class GHRepository extends GHObject {
 
     private GHRepository source, parent;
 
+    private Boolean isTemplate;
+
+    static GHRepository read(GitHub root, String owner, String name) throws IOException {
+        return root.createRequest().withUrlPath("/repos/" + owner + '/' + name).fetch(GHRepository.class).wrap(root);
+    }
+
     /**
      * Create deployment gh deployment builder.
      *
@@ -692,6 +698,28 @@ public boolean isPrivate() {
         return _private;
     }
 
+    /**
+     * Is template boolean.
+     *
+     * @return the boolean
+     */
+    @Deprecated
+    @Preview
+    public boolean isTemplate() {
+        // isTemplate is still in preview, we do not want to retrieve it unless needed.
+        if (isTemplate == null) {
+            try {
+                populate();
+            } catch (IOException e) {
+                // Convert this to a runtime exception to avoid messy method signature
+                throw new GHException("Could not populate the template setting of the repository", e);
+            }
+            // if this somehow is not populated, set it to false;
+            isTemplate = Boolean.TRUE.equals(isTemplate);
+        }
+        return isTemplate;
+    }
+
     /**
      * Has downloads boolean.
      *
@@ -2855,10 +2883,10 @@ void populate() throws IOException {
             // There is bug in Push event payloads that returns the wrong url.
             // All other occurrences of "url" take the form "https://api.github.com/...".
             // For Push event repository records, they take the form "https://github.com/{fullName}".
-            root.createRequest().setRawUrlPath(url.toString()).fetchInto(this).wrap(root);
+            root.createRequest().withPreview(BAPTISE).setRawUrlPath(url.toString()).fetchInto(this).wrap(root);
         } catch (HttpException e) {
             if (e.getCause() instanceof JsonParseException) {
-                root.createRequest().withUrlPath("/repos/" + full_name).fetchInto(this).wrap(root);
+                root.createRequest().withPreview(BAPTISE).withUrlPath("/repos/" + full_name).fetchInto(this).wrap(root);
             } else {
                 throw e;
             }
diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java
index d79c2929cf..bb51a2de0e 100644
--- a/src/main/java/org/kohsuke/github/GitHub.java
+++ b/src/main/java/org/kohsuke/github/GitHub.java
@@ -546,9 +546,7 @@ public GHRepository getRepository(String name) throws IOException {
         if (tokens.length < 2) {
             throw new IllegalArgumentException("Repository name must be in format owner/repo");
         }
-        return createRequest().withUrlPath("/repos/" + tokens[0] + '/' + tokens[1])
-                .fetch(GHRepository.class)
-                .wrap(this);
+        return GHRepository.read(this, tokens[0], tokens[1]);
     }
 
     /**
diff --git a/src/main/java/org/kohsuke/github/GitHubClient.java b/src/main/java/org/kohsuke/github/GitHubClient.java
index b27932448e..e59ae5f087 100644
--- a/src/main/java/org/kohsuke/github/GitHubClient.java
+++ b/src/main/java/org/kohsuke/github/GitHubClient.java
@@ -405,7 +405,7 @@ public <T> GitHubResponse<T> sendRequest(GitHubRequest request, @CheckForNull Gi
                         // Setting "Cache-Control" to "no-cache" stops the cache from supplying
                         // "If-Modified-Since" or "If-None-Match" values.
                         // This makes GitHub give us current data (not incorrectly cached data)
-                        request = request.toBuilder().withHeader("Cache-Control", "no-cache").build();
+                        request = request.toBuilder().setHeader("Cache-Control", "no-cache").build();
                         continue;
                     }
                     if (!(isRateLimitResponse(responseInfo) || isAbuseLimitResponse(responseInfo))) {
diff --git a/src/main/java/org/kohsuke/github/GitHubRequest.java b/src/main/java/org/kohsuke/github/GitHubRequest.java
index 1148073b25..8661d10a81 100644
--- a/src/main/java/org/kohsuke/github/GitHubRequest.java
+++ b/src/main/java/org/kohsuke/github/GitHubRequest.java
@@ -384,9 +384,11 @@ public B withApiUrl(String url) {
          *            the name
          * @param value
          *            the value
+         * @return the request builder
          */
-        public void setHeader(String name, String value) {
+        public B setHeader(String name, String value) {
             headers.put(name, value);
+            return (B) this;
         }
 
         /**
@@ -399,8 +401,11 @@ public void setHeader(String name, String value) {
          * @return the request builder
          */
         public B withHeader(String name, String value) {
-            setHeader(name, value);
-            return (B) this;
+            String oldValue = headers.get(name);
+            if (!StringUtils.isBlank(oldValue)) {
+                value = oldValue + ", " + value;
+            }
+            return setHeader(name, value);
         }
 
         /**
diff --git a/src/main/java/org/kohsuke/github/Previews.java b/src/main/java/org/kohsuke/github/Previews.java
index c070905908..a50425f470 100644
--- a/src/main/java/org/kohsuke/github/Previews.java
+++ b/src/main/java/org/kohsuke/github/Previews.java
@@ -15,6 +15,14 @@ class Previews {
      */
     static final String ANTIOPE = "application/vnd.github.antiope-preview+json";
 
+    /**
+     * Create repository from template repository
+     *
+     * @see <a href="https://developer.github.com/v3/previews/#create-and-use-repository-templates">GitHub API
+     *      Previews</a>
+     */
+    static final String BAPTISE = "application/vnd.github.baptiste-preview+json";
+
     /**
      * Commit Search
      *
@@ -58,6 +66,14 @@ class Previews {
      */
     static final String MERCY = "application/vnd.github.mercy-preview+json";
 
+    /**
+     * New visibility parameter for the Repositories API
+     *
+     * @see <a href="https://developer.github.com/v3/previews/#new-visibility-parameter-for-the-repositories-api">GitHub
+     *      API Previews</a>
+     */
+    static final String NEBULA = "application/vnd.github.nebula-preview+json";
+
     /**
      * Draft pull requests
      *
@@ -79,11 +95,4 @@ class Previews {
      */
     static final String ZZZAX = "application/vnd.github.zzzax-preview+json";
 
-    /**
-     * Create repository from template repository
-     *
-     * @see <a href="https://developer.github.com/v3/previews/#create-and-use-repository-templates">GitHub API
-     *      Previews</a>
-     */
-    static final String BAPTISE = "application/vnd.github.baptiste-preview+json";
 }
diff --git a/src/test/java/org/kohsuke/github/GHOrganizationTest.java b/src/test/java/org/kohsuke/github/GHOrganizationTest.java
index 18a7e30e74..6bccba7731 100644
--- a/src/test/java/org/kohsuke/github/GHOrganizationTest.java
+++ b/src/test/java/org/kohsuke/github/GHOrganizationTest.java
@@ -9,6 +9,8 @@
 import java.io.IOException;
 import java.util.List;
 
+import static org.hamcrest.Matchers.*;
+
 public class GHOrganizationTest extends AbstractGitHubWireMockTest {
 
     public static final String GITHUB_API_TEST = "github-api-test";
@@ -59,18 +61,39 @@ public void testCreateRepositoryWithAutoInitialization() throws IOException {
 
     @Test
     public void testCreateRepositoryWithParameterIsTemplate() throws IOException {
-        cleanupRepository(GITHUB_API_TEST_ORG + '/' + GITHUB_API_TEST);
+        cleanupRepository(GITHUB_API_TEST_ORG + '/' + GITHUB_API_TEMPLATE_TEST);
 
         GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
+        GHTeam team = org.getTeamByName("Core Developers");
+
+        int requestCount = mockGitHub.getRequestCount();
         GHRepository repository = org.createRepository(GITHUB_API_TEMPLATE_TEST)
                 .description("a test template repository used to test kohsuke's github-api")
                 .homepage("http://github-api.kohsuke.org/")
-                .team(org.getTeamByName("Core Developers"))
+                .team(team)
                 .autoInit(true)
                 .templateRepository(true)
                 .create();
         Assert.assertNotNull(repository);
+        assertThat(mockGitHub.getRequestCount(), equalTo(requestCount + 1));
+
         Assert.assertNotNull(repository.getReadme());
+        assertThat(mockGitHub.getRequestCount(), equalTo(requestCount + 2));
+
+        // isTemplate() does not call populate() from create
+        assertThat(repository.isTemplate(), equalTo(true));
+        assertThat(mockGitHub.getRequestCount(), equalTo(requestCount + 2));
+
+        repository = org.getRepository(GITHUB_API_TEMPLATE_TEST);
+
+        // first isTemplate() calls populate()
+        assertThat(repository.isTemplate(), equalTo(true));
+        assertThat(mockGitHub.getRequestCount(), equalTo(requestCount + 4));
+
+        // second isTemplate() does not call populate()
+        assertThat(repository.isTemplate(), equalTo(true));
+        assertThat(mockGitHub.getRequestCount(), equalTo(requestCount + 4));
+
     }
 
     @Test
@@ -85,6 +108,7 @@ public void testCreateRepositoryWithTemplate() throws IOException {
 
         Assert.assertNotNull(repository);
         Assert.assertNotNull(repository.getReadme());
+
     }
 
     @Test
diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-2.json
index 194a6c042f..24daf3aa55 100644
--- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-2.json
+++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/__files/repos_hub4j-test-org_github-api-2.json
@@ -93,6 +93,7 @@
     "url": "https://api.github.com/licenses/mit",
     "node_id": "MDc6TGljZW5zZTEz"
   },
+  "is_template": false,
   "forks": 0,
   "open_issues": 5,
   "watchers": 0,
diff --git a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json
index e3d32d748a..2b8a5b8013 100644
--- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json
+++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j-test-org_github-api-2.json
@@ -6,7 +6,7 @@
     "method": "GET",
     "headers": {
       "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+        "equalTo": "application/vnd.github.baptiste-preview+json"
       }
     }
   },
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org-2.json
index def8ed366a..b115ab2ee6 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org-2.json
@@ -10,22 +10,28 @@
   "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
   "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
   "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
-  "description": null,
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "hub4jtestorgemail@could.be.null.com",
+  "twitter_username": null,
   "is_verified": false,
   "has_organization_projects": true,
   "has_repository_projects": true,
-  "public_repos": 9,
+  "public_repos": 12,
   "public_gists": 0,
   "followers": 0,
   "following": 0,
   "html_url": "https://github.com/hub4j-test-org",
   "created_at": "2014-05-10T19:39:11Z",
-  "updated_at": "2015-04-20T00:42:30Z",
+  "updated_at": "2020-06-04T05:56:10Z",
   "type": "Organization",
   "total_private_repos": 0,
   "owned_private_repos": 0,
   "private_gists": 0,
-  "disk_usage": 132,
+  "disk_usage": 148,
   "collaborators": 0,
   "billing_email": "kk@kohsuke.org",
   "default_repository_permission": "none",
@@ -34,8 +40,8 @@
   "plan": {
     "name": "free",
     "space": 976562499,
-    "private_repos": 0,
-    "filled_seats": 3,
-    "seats": 0
+    "private_repos": 10000,
+    "filled_seats": 18,
+    "seats": 3
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_repos-4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_repos-4.json
index 9146543557..06c8fce018 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_repos-4.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_repos-4.json
@@ -1,6 +1,6 @@
 {
-  "id": 212682270,
-  "node_id": "MDEwOlJlcG9zaXRvcnkyMTI2ODIyNzA=",
+  "id": 287150018,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyODcxNTAwMTg=",
   "name": "github-api-template-test",
   "full_name": "hub4j-test-org/github-api-template-test",
   "private": false,
@@ -10,63 +10,63 @@
     "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
     "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
     "gravatar_id": "",
-    "url": "http://localhost:51951/users/hub4j-test-org",
+    "url": "https://api.github.com/users/hub4j-test-org",
     "html_url": "https://github.com/hub4j-test-org",
-    "followers_url": "http://localhost:51951/users/hub4j-test-org/followers",
-    "following_url": "http://localhost:51951/users/hub4j-test-org/following{/other_user}",
-    "gists_url": "http://localhost:51951/users/hub4j-test-org/gists{/gist_id}",
-    "starred_url": "http://localhost:51951/users/hub4j-test-org/starred{/owner}{/repo}",
-    "subscriptions_url": "http://localhost:51951/users/hub4j-test-org/subscriptions",
-    "organizations_url": "http://localhost:51951/users/hub4j-test-org/orgs",
-    "repos_url": "http://localhost:51951/users/hub4j-test-org/repos",
-    "events_url": "http://localhost:51951/users/hub4j-test-org/events{/privacy}",
-    "received_events_url": "http://localhost:51951/users/hub4j-test-org/received_events",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
     "type": "Organization",
     "site_admin": false
   },
   "html_url": "https://github.com/hub4j-test-org/github-api-template-test",
-  "description": "a test repository used to test kohsuke's github-api",
+  "description": "a test template repository used to test kohsuke's github-api",
   "fork": false,
-  "url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test",
-  "forks_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/forks",
-  "keys_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/keys{/key_id}",
-  "collaborators_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/collaborators{/collaborator}",
-  "teams_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/teams",
-  "hooks_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/hooks",
-  "issue_events_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/issues/events{/number}",
-  "events_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/events",
-  "assignees_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/assignees{/user}",
-  "branches_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/branches{/branch}",
-  "tags_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/tags",
-  "blobs_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/git/blobs{/sha}",
-  "git_tags_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/git/tags{/sha}",
-  "git_refs_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/git/refs{/sha}",
-  "trees_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/git/trees{/sha}",
-  "statuses_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/statuses/{sha}",
-  "languages_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/languages",
-  "stargazers_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/stargazers",
-  "contributors_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/contributors",
-  "subscribers_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/subscribers",
-  "subscription_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/subscription",
-  "commits_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/commits{/sha}",
-  "git_commits_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/git/commits{/sha}",
-  "comments_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/comments{/number}",
-  "issue_comment_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/issues/comments{/number}",
-  "contents_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/contents/{+path}",
-  "compare_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/compare/{base}...{head}",
-  "merges_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/merges",
-  "archive_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/{archive_format}{/ref}",
-  "downloads_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/downloads",
-  "issues_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/issues{/number}",
-  "pulls_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/pulls{/number}",
-  "milestones_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/milestones{/number}",
-  "notifications_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/notifications{?since,all,participating}",
-  "labels_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/labels{/name}",
-  "releases_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/releases{/id}",
-  "deployments_url": "http://localhost:51951/repos/hub4j-test-org/github-api-template-test/deployments",
-  "created_at": "2019-10-03T21:18:43Z",
-  "updated_at": "2019-10-03T21:18:43Z",
-  "pushed_at": "2019-10-03T21:18:44Z",
+  "url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test",
+  "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/forks",
+  "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/keys{/key_id}",
+  "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/collaborators{/collaborator}",
+  "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/teams",
+  "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/hooks",
+  "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues/events{/number}",
+  "events_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/events",
+  "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/assignees{/user}",
+  "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/branches{/branch}",
+  "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/tags",
+  "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs{/sha}",
+  "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/tags{/sha}",
+  "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/refs{/sha}",
+  "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/trees{/sha}",
+  "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/statuses/{sha}",
+  "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/languages",
+  "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/stargazers",
+  "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contributors",
+  "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/subscribers",
+  "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/subscription",
+  "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/commits{/sha}",
+  "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/commits{/sha}",
+  "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/comments{/number}",
+  "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues/comments{/number}",
+  "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contents/{+path}",
+  "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/compare/{base}...{head}",
+  "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/merges",
+  "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/{archive_format}{/ref}",
+  "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/downloads",
+  "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues{/number}",
+  "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/pulls{/number}",
+  "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/milestones{/number}",
+  "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/notifications{?since,all,participating}",
+  "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/labels{/name}",
+  "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/releases{/id}",
+  "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/deployments",
+  "created_at": "2020-08-13T01:15:24Z",
+  "updated_at": "2020-08-13T01:15:24Z",
+  "pushed_at": "2020-08-13T01:15:26Z",
   "git_url": "git://github.com/hub4j-test-org/github-api-template-test.git",
   "ssh_url": "git@github.com:hub4j-test-org/github-api-template-test.git",
   "clone_url": "https://github.com/hub4j-test-org/github-api-template-test.git",
@@ -87,6 +87,7 @@
   "disabled": false,
   "open_issues_count": 0,
   "license": null,
+  "is_template": true,
   "forks": 0,
   "open_issues": 0,
   "watchers": 0,
@@ -99,26 +100,28 @@
   "allow_squash_merge": true,
   "allow_merge_commit": true,
   "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
+  "template_repository": null,
   "organization": {
     "login": "hub4j-test-org",
     "id": 7544739,
     "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
     "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
     "gravatar_id": "",
-    "url": "http://localhost:51951/users/hub4j-test-org",
+    "url": "https://api.github.com/users/hub4j-test-org",
     "html_url": "https://github.com/hub4j-test-org",
-    "followers_url": "http://localhost:51951/users/hub4j-test-org/followers",
-    "following_url": "http://localhost:51951/users/hub4j-test-org/following{/other_user}",
-    "gists_url": "http://localhost:51951/users/hub4j-test-org/gists{/gist_id}",
-    "starred_url": "http://localhost:51951/users/hub4j-test-org/starred{/owner}{/repo}",
-    "subscriptions_url": "http://localhost:51951/users/hub4j-test-org/subscriptions",
-    "organizations_url": "http://localhost:51951/users/hub4j-test-org/orgs",
-    "repos_url": "http://localhost:51951/users/hub4j-test-org/repos",
-    "events_url": "http://localhost:51951/users/hub4j-test-org/events{/privacy}",
-    "received_events_url": "http://localhost:51951/users/hub4j-test-org/received_events",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
     "type": "Organization",
     "site_admin": false
   },
   "network_count": 0,
-  "subscribers_count": 2
+  "subscribers_count": 8
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_teams-3.json
index 1cf97758b6..8df40440c8 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_teams-3.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/orgs_hub4j-test-org_teams-3.json
@@ -1,16 +1,29 @@
 [
   {
-    "name": "Owners",
-    "id": 820404,
-    "node_id": "MDQ6VGVhbTgyMDQwNA==",
-    "slug": "owners",
-    "description": null,
-    "privacy": "secret",
-    "url": "https://api.github.com/teams/820404",
-    "html_url": "https://github.com/orgs/hub4j-test-org/teams/owners",
-    "members_url": "https://api.github.com/teams/820404/members{/member}",
-    "repositories_url": "https://api.github.com/teams/820404/repos",
-    "permission": "admin"
+    "name": "child-team-for-dummy",
+    "id": 3903497,
+    "node_id": "MDQ6VGVhbTM5MDM0OTc=",
+    "slug": "child-team-for-dummy",
+    "description": "to test the fetching of child teams",
+    "privacy": "closed",
+    "url": "https://api.github.com/organizations/7544739/team/3903497",
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/child-team-for-dummy",
+    "members_url": "https://api.github.com/organizations/7544739/team/3903497/members{/member}",
+    "repositories_url": "https://api.github.com/organizations/7544739/team/3903497/repos",
+    "permission": "pull",
+    "parent": {
+      "name": "dummy-team",
+      "id": 3451996,
+      "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+      "slug": "dummy-team",
+      "description": "Updated by API TestModified",
+      "privacy": "closed",
+      "url": "https://api.github.com/organizations/7544739/team/3451996",
+      "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+      "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+      "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+      "permission": "pull"
+    }
   },
   {
     "name": "Core Developers",
@@ -19,10 +32,67 @@
     "slug": "core-developers",
     "description": "A random team",
     "privacy": "secret",
-    "url": "https://api.github.com/teams/820406",
+    "url": "https://api.github.com/organizations/7544739/team/820406",
     "html_url": "https://github.com/orgs/hub4j-test-org/teams/core-developers",
-    "members_url": "https://api.github.com/teams/820406/members{/member}",
-    "repositories_url": "https://api.github.com/teams/820406/repos",
-    "permission": "pull"
+    "members_url": "https://api.github.com/organizations/7544739/team/820406/members{/member}",
+    "repositories_url": "https://api.github.com/organizations/7544739/team/820406/repos",
+    "permission": "pull",
+    "parent": null
+  },
+  {
+    "name": "dummy-team",
+    "id": 3451996,
+    "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+    "slug": "dummy-team",
+    "description": "Updated by API TestModified",
+    "privacy": "closed",
+    "url": "https://api.github.com/organizations/7544739/team/3451996",
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+    "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+    "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+    "permission": "pull",
+    "parent": null
+  },
+  {
+    "name": "Owners-team",
+    "id": 820404,
+    "node_id": "MDQ6VGVhbTgyMDQwNA==",
+    "slug": "owners-team",
+    "description": null,
+    "privacy": "secret",
+    "url": "https://api.github.com/organizations/7544739/team/820404",
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/owners-team",
+    "members_url": "https://api.github.com/organizations/7544739/team/820404/members{/member}",
+    "repositories_url": "https://api.github.com/organizations/7544739/team/820404/repos",
+    "permission": "pull",
+    "parent": null
+  },
+  {
+    "name": "simple-team",
+    "id": 3947450,
+    "node_id": "MDQ6VGVhbTM5NDc0NTA=",
+    "slug": "simple-team",
+    "description": "A simple team with no children",
+    "privacy": "closed",
+    "url": "https://api.github.com/organizations/7544739/team/3947450",
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/simple-team",
+    "members_url": "https://api.github.com/organizations/7544739/team/3947450/members{/member}",
+    "repositories_url": "https://api.github.com/organizations/7544739/team/3947450/repos",
+    "permission": "pull",
+    "parent": null
+  },
+  {
+    "name": "tricky-team",
+    "id": 3454508,
+    "node_id": "MDQ6VGVhbTM0NTQ1MDg=",
+    "slug": "tricky-team",
+    "description": "",
+    "privacy": "secret",
+    "url": "https://api.github.com/organizations/7544739/team/3454508",
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/tricky-team",
+    "members_url": "https://api.github.com/organizations/7544739/team/3454508/members{/member}",
+    "repositories_url": "https://api.github.com/organizations/7544739/team/3454508/repos",
+    "permission": "pull",
+    "parent": null
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test-6.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test-6.json
new file mode 100644
index 0000000000..b5a4d515b7
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test-6.json
@@ -0,0 +1,126 @@
+{
+  "id": 287150018,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyODcxNTAwMTg=",
+  "name": "github-api-template-test",
+  "full_name": "hub4j-test-org/github-api-template-test",
+  "private": false,
+  "owner": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/hub4j-test-org",
+    "html_url": "https://github.com/hub4j-test-org",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "html_url": "https://github.com/hub4j-test-org/github-api-template-test",
+  "description": "a test template repository used to test kohsuke's github-api",
+  "fork": false,
+  "url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test",
+  "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/forks",
+  "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/keys{/key_id}",
+  "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/collaborators{/collaborator}",
+  "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/teams",
+  "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/hooks",
+  "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues/events{/number}",
+  "events_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/events",
+  "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/assignees{/user}",
+  "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/branches{/branch}",
+  "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/tags",
+  "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs{/sha}",
+  "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/tags{/sha}",
+  "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/refs{/sha}",
+  "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/trees{/sha}",
+  "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/statuses/{sha}",
+  "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/languages",
+  "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/stargazers",
+  "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contributors",
+  "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/subscribers",
+  "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/subscription",
+  "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/commits{/sha}",
+  "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/commits{/sha}",
+  "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/comments{/number}",
+  "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues/comments{/number}",
+  "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contents/{+path}",
+  "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/compare/{base}...{head}",
+  "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/merges",
+  "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/{archive_format}{/ref}",
+  "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/downloads",
+  "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues{/number}",
+  "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/pulls{/number}",
+  "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/milestones{/number}",
+  "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/notifications{?since,all,participating}",
+  "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/labels{/name}",
+  "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/releases{/id}",
+  "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/deployments",
+  "created_at": "2020-08-13T01:15:24Z",
+  "updated_at": "2020-08-13T01:15:24Z",
+  "pushed_at": "2020-08-13T01:15:26Z",
+  "git_url": "git://github.com/hub4j-test-org/github-api-template-test.git",
+  "ssh_url": "git@github.com:hub4j-test-org/github-api-template-test.git",
+  "clone_url": "https://github.com/hub4j-test-org/github-api-template-test.git",
+  "svn_url": "https://github.com/hub4j-test-org/github-api-template-test",
+  "homepage": "http://github-api.kohsuke.org/",
+  "size": 0,
+  "stargazers_count": 0,
+  "watchers_count": 0,
+  "language": null,
+  "has_issues": true,
+  "has_projects": true,
+  "has_downloads": true,
+  "has_wiki": true,
+  "has_pages": false,
+  "forks_count": 0,
+  "mirror_url": null,
+  "archived": false,
+  "disabled": false,
+  "open_issues_count": 0,
+  "license": null,
+  "forks": 0,
+  "open_issues": 0,
+  "watchers": 0,
+  "default_branch": "master",
+  "permissions": {
+    "admin": true,
+    "push": true,
+    "pull": true
+  },
+  "temp_clone_token": "",
+  "allow_squash_merge": true,
+  "allow_merge_commit": true,
+  "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/hub4j-test-org",
+    "html_url": "https://github.com/hub4j-test-org",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "network_count": 0,
+  "subscribers_count": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test-7.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test-7.json
new file mode 100644
index 0000000000..761688ee06
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test-7.json
@@ -0,0 +1,128 @@
+{
+  "id": 287150018,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyODcxNTAwMTg=",
+  "name": "github-api-template-test",
+  "full_name": "hub4j-test-org/github-api-template-test",
+  "private": false,
+  "owner": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/hub4j-test-org",
+    "html_url": "https://github.com/hub4j-test-org",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "html_url": "https://github.com/hub4j-test-org/github-api-template-test",
+  "description": "a test template repository used to test kohsuke's github-api",
+  "fork": false,
+  "url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test",
+  "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/forks",
+  "keys_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/keys{/key_id}",
+  "collaborators_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/collaborators{/collaborator}",
+  "teams_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/teams",
+  "hooks_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/hooks",
+  "issue_events_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues/events{/number}",
+  "events_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/events",
+  "assignees_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/assignees{/user}",
+  "branches_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/branches{/branch}",
+  "tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/tags",
+  "blobs_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs{/sha}",
+  "git_tags_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/tags{/sha}",
+  "git_refs_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/refs{/sha}",
+  "trees_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/trees{/sha}",
+  "statuses_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/statuses/{sha}",
+  "languages_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/languages",
+  "stargazers_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/stargazers",
+  "contributors_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contributors",
+  "subscribers_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/subscribers",
+  "subscription_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/subscription",
+  "commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/commits{/sha}",
+  "git_commits_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/commits{/sha}",
+  "comments_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/comments{/number}",
+  "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues/comments{/number}",
+  "contents_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contents/{+path}",
+  "compare_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/compare/{base}...{head}",
+  "merges_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/merges",
+  "archive_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/{archive_format}{/ref}",
+  "downloads_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/downloads",
+  "issues_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/issues{/number}",
+  "pulls_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/pulls{/number}",
+  "milestones_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/milestones{/number}",
+  "notifications_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/notifications{?since,all,participating}",
+  "labels_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/labels{/name}",
+  "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/releases{/id}",
+  "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/deployments",
+  "created_at": "2020-08-13T01:15:24Z",
+  "updated_at": "2020-08-13T01:15:24Z",
+  "pushed_at": "2020-08-13T01:15:26Z",
+  "git_url": "git://github.com/hub4j-test-org/github-api-template-test.git",
+  "ssh_url": "git@github.com:hub4j-test-org/github-api-template-test.git",
+  "clone_url": "https://github.com/hub4j-test-org/github-api-template-test.git",
+  "svn_url": "https://github.com/hub4j-test-org/github-api-template-test",
+  "homepage": "http://github-api.kohsuke.org/",
+  "size": 0,
+  "stargazers_count": 0,
+  "watchers_count": 0,
+  "language": null,
+  "has_issues": true,
+  "has_projects": true,
+  "has_downloads": true,
+  "has_wiki": true,
+  "has_pages": false,
+  "forks_count": 0,
+  "mirror_url": null,
+  "archived": false,
+  "disabled": false,
+  "open_issues_count": 0,
+  "license": null,
+  "is_template": true,
+  "forks": 0,
+  "open_issues": 0,
+  "watchers": 0,
+  "default_branch": "master",
+  "permissions": {
+    "admin": true,
+    "push": true,
+    "pull": true
+  },
+  "temp_clone_token": "",
+  "allow_squash_merge": true,
+  "allow_merge_commit": true,
+  "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
+  "template_repository": null,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/hub4j-test-org",
+    "html_url": "https://github.com/hub4j-test-org",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "network_count": 0,
+  "subscribers_count": 8
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-test_readme-5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test_readme-5.json
similarity index 68%
rename from src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-test_readme-5.json
rename to src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test_readme-5.json
index c6fbf02fb1..09dd990214 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-test_readme-5.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/repos_hub4j-test-org_github-api-template-test_readme-5.json
@@ -1,18 +1,18 @@
 {
   "name": "README.md",
   "path": "README.md",
-  "sha": "aa0e9008d8d8c4745d81d718b5d418f6a5529759",
-  "size": 70,
+  "sha": "35aeb188a0da54af7121ef149d90bdfb05694c61",
+  "size": 88,
   "url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contents/README.md?ref=master",
   "html_url": "https://github.com/hub4j-test-org/github-api-template-test/blob/master/README.md",
-  "git_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs/aa0e9008d8d8c4745d81d718b5d418f6a5529759",
+  "git_url": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs/35aeb188a0da54af7121ef149d90bdfb05694c61",
   "download_url": "https://raw.githubusercontent.com/hub4j-test-org/github-api-template-test/master/README.md",
   "type": "file",
-  "content": "IyBnaXRodWItYXBpLXRlc3QKYSB0ZXN0IHJlcG9zaXRvcnkgdXNlZCB0byB0\nZXN0IGtvaHN1a2UncyBnaXRodWItYXBpCg==\n",
+  "content": "IyBnaXRodWItYXBpLXRlbXBsYXRlLXRlc3QKYSB0ZXN0IHRlbXBsYXRlIHJl\ncG9zaXRvcnkgdXNlZCB0byB0ZXN0IGtvaHN1a2UncyBnaXRodWItYXBpCg==\n",
   "encoding": "base64",
   "_links": {
     "self": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/contents/README.md?ref=master",
-    "git": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs/aa0e9008d8d8c4745d81d718b5d418f6a5529759",
+    "git": "https://api.github.com/repos/hub4j-test-org/github-api-template-test/git/blobs/35aeb188a0da54af7121ef149d90bdfb05694c61",
     "html": "https://github.com/hub4j-test-org/github-api-template-test/blob/master/README.md"
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/user-1.json
index 39d6c8353e..bb255da1ed 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/__files/user-1.json
@@ -23,17 +23,18 @@
   "location": "Seattle, WA, USA",
   "email": "bitwiseman@gmail.com",
   "hireable": null,
-  "bio": "https://twitter.com/bitwiseman",
-  "public_repos": 167,
-  "public_gists": 4,
-  "followers": 136,
-  "following": 9,
+  "bio": null,
+  "twitter_username": "bitwiseman",
+  "public_repos": 197,
+  "public_gists": 7,
+  "followers": 165,
+  "following": 11,
   "created_at": "2012-07-11T20:38:33Z",
-  "updated_at": "2019-09-24T19:32:29Z",
-  "private_gists": 7,
-  "total_private_repos": 9,
+  "updated_at": "2020-08-03T18:04:21Z",
+  "private_gists": 19,
+  "total_private_repos": 13,
   "owned_private_repos": 0,
-  "disk_usage": 33697,
+  "disk_usage": 33700,
   "collaborators": 0,
   "two_factor_authentication": true,
   "plan": {
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org-2.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org-2.json
index 44e1d6ce2d..699928501a 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org-2.json
@@ -1,5 +1,5 @@
 {
-  "id": "7b0ac54c-1ef0-453a-99db-a480b3b5a746",
+  "id": "64613cb5-afbe-4551-a437-cf2110d2d38e",
   "name": "orgs_hub4j-test-org",
   "request": {
     "url": "/orgs/hub4j-test-org",
@@ -14,35 +14,34 @@
     "status": 200,
     "bodyFileName": "orgs_hub4j-test-org-2.json",
     "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:43 GMT",
+      "Date": "Thu, 13 Aug 2020 01:15:24 GMT",
       "Content-Type": "application/json; charset=utf-8",
       "Server": "GitHub.com",
       "Status": "200 OK",
       "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4900",
-      "X-RateLimit-Reset": "1570140015",
+      "X-RateLimit-Remaining": "4936",
+      "X-RateLimit-Reset": "1597282078",
       "Cache-Control": "private, max-age=60, s-maxage=60",
       "Vary": [
         "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
         "Accept-Encoding"
       ],
-      "ETag": "W/\"d36965e157281b2a309c39e4c2343a55\"",
-      "Last-Modified": "Mon, 20 Apr 2015 00:42:30 GMT",
+      "ETag": "W/\"6bd323dd4ab2a01dae2464621246c3cd\"",
+      "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT",
       "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
       "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
       "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
       "X-Frame-Options": "deny",
       "X-Content-Type-Options": "nosniff",
       "X-XSS-Protection": "1; mode=block",
       "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
       "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11DD:8037AC:5D9665B2"
+      "X-GitHub-Request-Id": "D640:8464:9DD8B0:C076CC:5F34942B"
     }
   },
-  "uuid": "7b0ac54c-1ef0-453a-99db-a480b3b5a746",
+  "uuid": "64613cb5-afbe-4551-a437-cf2110d2d38e",
   "persistent": true,
   "insertionIndex": 2
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_repos-4.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_repos-4.json
index 09eb04f848..cd4fc28b5d 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_repos-4.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_repos-4.json
@@ -1,55 +1,54 @@
 {
-  "id": "423c774e-3d61-423a-ad0d-ee166bf2b4de",
+  "id": "f1aa4c72-b432-41bc-959a-b14dde1e080a",
   "name": "orgs_hub4j-test-org_repos",
   "request": {
     "url": "/orgs/hub4j-test-org/repos",
     "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.baptiste-preview+json"
+      }
+    },
     "bodyPatterns": [
       {
         "equalToJson": "{\"auto_init\":true,\"is_template\":true,\"name\":\"github-api-template-test\",\"description\":\"a test template repository used to test kohsuke's github-api\",\"team_id\":820406,\"homepage\":\"http://github-api.kohsuke.org/\"}",
         "ignoreArrayOrder": true,
-        "ignoreExtraElements": true
+        "ignoreExtraElements": false
       }
-    ],
-    "headers": {
-      "Accept": {
-        "equalTo": "application/vnd.github.baptiste-preview+json"
-      }
-    }
+    ]
   },
   "response": {
     "status": 201,
     "bodyFileName": "orgs_hub4j-test-org_repos-4.json",
     "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:45 GMT",
+      "Date": "Thu, 13 Aug 2020 01:15:26 GMT",
       "Content-Type": "application/json; charset=utf-8",
       "Server": "GitHub.com",
       "Status": "201 Created",
       "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4898",
-      "X-RateLimit-Reset": "1570140015",
+      "X-RateLimit-Remaining": "4934",
+      "X-RateLimit-Reset": "1597282078",
       "Cache-Control": "private, max-age=60, s-maxage=60",
       "Vary": [
         "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
         "Accept-Encoding"
       ],
-      "ETag": "\"2b3e3ea59f28d3dadc92e7bb9aa81918\"",
+      "ETag": "\"fda55334377438fa2bb705d94a118609\"",
       "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
       "X-Accepted-OAuth-Scopes": "public_repo, repo",
       "Location": "https://api.github.com/repos/hub4j-test-org/github-api-template-test",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
+      "X-GitHub-Media-Type": "github.baptiste-preview; format=json",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
       "X-Frame-Options": "deny",
       "X-Content-Type-Options": "nosniff",
       "X-XSS-Protection": "1; mode=block",
       "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
       "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11EA:8037CF:5D9665B3"
+      "X-GitHub-Request-Id": "D640:8464:9DD8C4:C07723:5F34942C"
     }
   },
-  "uuid": "423c774e-3d61-423a-ad0d-ee166bf2b4de",
+  "uuid": "f1aa4c72-b432-41bc-959a-b14dde1e080a",
   "persistent": true,
   "insertionIndex": 4
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_teams-3.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_teams-3.json
index d2444cce88..474eb7b185 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_teams-3.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/orgs_hub4j-test-org_teams-3.json
@@ -1,5 +1,5 @@
 {
-  "id": "eb06b2d9-1dda-4070-bdfe-3005f550e7ec",
+  "id": "4f126b51-7cb6-424e-9aa8-395f48860e51",
   "name": "orgs_hub4j-test-org_teams",
   "request": {
     "url": "/orgs/hub4j-test-org/teams",
@@ -14,34 +14,33 @@
     "status": 200,
     "bodyFileName": "orgs_hub4j-test-org_teams-3.json",
     "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:43 GMT",
+      "Date": "Thu, 13 Aug 2020 01:15:24 GMT",
       "Content-Type": "application/json; charset=utf-8",
       "Server": "GitHub.com",
       "Status": "200 OK",
       "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4899",
-      "X-RateLimit-Reset": "1570140015",
+      "X-RateLimit-Remaining": "4935",
+      "X-RateLimit-Reset": "1597282078",
       "Cache-Control": "private, max-age=60, s-maxage=60",
       "Vary": [
         "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
         "Accept-Encoding"
       ],
-      "ETag": "W/\"67966e090e6d1b149d83e98c21d76074\"",
+      "ETag": "W/\"71960ec48b22f121f59c820c09a4058f\"",
       "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
       "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
       "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
       "X-Frame-Options": "deny",
       "X-Content-Type-Options": "nosniff",
       "X-XSS-Protection": "1; mode=block",
       "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
       "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11E4:8037CB:5D9665B3"
+      "X-GitHub-Request-Id": "D640:8464:9DD8BA:C07719:5F34942C"
     }
   },
-  "uuid": "eb06b2d9-1dda-4070-bdfe-3005f550e7ec",
+  "uuid": "4f126b51-7cb6-424e-9aa8-395f48860e51",
   "persistent": true,
   "insertionIndex": 3
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test-6.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test-6.json
new file mode 100644
index 0000000000..a92613a745
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test-6.json
@@ -0,0 +1,47 @@
+{
+  "id": "aa3aa550-c924-48f3-a0ed-cabd7b45bc0a",
+  "name": "repos_hub4j-test-org_github-api-template-test",
+  "request": {
+    "url": "/repos/hub4j-test-org/github-api-template-test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_hub4j-test-org_github-api-template-test-6.json",
+    "headers": {
+      "Date": "Thu, 13 Aug 2020 01:15:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4932",
+      "X-RateLimit-Reset": "1597282078",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"359b3626da7d5a18eef0da0d9ae96bef\"",
+      "Last-Modified": "Thu, 13 Aug 2020 01:15:24 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D640:8464:9DD96F:C07800:5F34942F"
+    }
+  },
+  "uuid": "aa3aa550-c924-48f3-a0ed-cabd7b45bc0a",
+  "persistent": true,
+  "insertionIndex": 6
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test-7.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test-7.json
new file mode 100644
index 0000000000..393a05c669
--- /dev/null
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "51d54e86-a714-457b-88d6-5c045631a074",
+  "name": "repos_hub4j-test-org_github-api-template-test",
+  "request": {
+    "url": "/repos/hub4j-test-org/github-api-template-test",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "application/vnd.github.baptiste-preview+json"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_hub4j-test-org_github-api-template-test-7.json",
+    "headers": {
+      "Date": "Thu, 13 Aug 2020 01:15:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4931",
+      "X-RateLimit-Reset": "1597282078",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"9fc368e29d30f2606085100fed431a74\"",
+      "Last-Modified": "Thu, 13 Aug 2020 01:15:24 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "github.baptiste-preview; format=json",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "D640:8464:9DD977:C0780E:5F34942F"
+    }
+  },
+  "uuid": "51d54e86-a714-457b-88d6-5c045631a074",
+  "persistent": true,
+  "insertionIndex": 7
+}
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test_readme-5.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test_readme-5.json
index 9651cfe1a3..71c9408c5d 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test_readme-5.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/repos_hub4j-test-org_github-api-template-test_readme-5.json
@@ -1,5 +1,5 @@
 {
-  "id": "12092c16-85de-454a-80ae-61c283738838",
+  "id": "06f3810a-0707-4686-887f-45d2d98c80de",
   "name": "repos_hub4j-test-org_github-api-template-test_readme",
   "request": {
     "url": "/repos/hub4j-test-org/github-api-template-test/readme",
@@ -12,37 +12,36 @@
   },
   "response": {
     "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api-test_readme-5.json",
+    "bodyFileName": "repos_hub4j-test-org_github-api-template-test_readme-5.json",
     "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:45 GMT",
+      "Date": "Thu, 13 Aug 2020 01:15:27 GMT",
       "Content-Type": "application/json; charset=utf-8",
       "Server": "GitHub.com",
       "Status": "200 OK",
       "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4897",
-      "X-RateLimit-Reset": "1570140015",
+      "X-RateLimit-Remaining": "4933",
+      "X-RateLimit-Reset": "1597282078",
       "Cache-Control": "private, max-age=60, s-maxage=60",
       "Vary": [
         "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
         "Accept-Encoding"
       ],
-      "ETag": "W/\"cabb44de69d6ea06b2d8ca4bb5b01405\"",
-      "Last-Modified": "Thu, 03 Oct 2019 21:18:44 GMT",
+      "ETag": "W/\"ff9b2b5427eefba6f576ffee03d31937\"",
+      "Last-Modified": "Thu, 13 Aug 2020 01:15:25 GMT",
       "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
       "X-Accepted-OAuth-Scopes": "",
       "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
       "X-Frame-Options": "deny",
       "X-Content-Type-Options": "nosniff",
       "X-XSS-Protection": "1; mode=block",
       "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
       "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B1234:803821:5D9665B5"
+      "X-GitHub-Request-Id": "D640:8464:9DD961:C077DF:5F34942E"
     }
   },
-  "uuid": "12092c16-85de-454a-80ae-61c283738838",
+  "uuid": "06f3810a-0707-4686-887f-45d2d98c80de",
   "persistent": true,
   "insertionIndex": 5
 }
\ No newline at end of file
diff --git a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/user-1.json b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/user-1.json
index 81eb1a6dc4..57cf0f3d9d 100644
--- a/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHOrganizationTest/wiremock/testCreateRepositoryWithParameterIsTemplate/mappings/user-1.json
@@ -1,5 +1,5 @@
 {
-  "id": "d246cfb6-e28a-417b-8d74-29080bbc1c4c",
+  "id": "5b73bc57-8168-4296-853a-61ed0eab5a01",
   "name": "user",
   "request": {
     "url": "/user",
@@ -14,35 +14,34 @@
     "status": 200,
     "bodyFileName": "user-1.json",
     "headers": {
-      "Date": "Thu, 03 Oct 2019 21:18:42 GMT",
+      "Date": "Thu, 13 Aug 2020 01:15:23 GMT",
       "Content-Type": "application/json; charset=utf-8",
       "Server": "GitHub.com",
       "Status": "200 OK",
       "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4904",
-      "X-RateLimit-Reset": "1570140015",
+      "X-RateLimit-Remaining": "4941",
+      "X-RateLimit-Reset": "1597282078",
       "Cache-Control": "private, max-age=60, s-maxage=60",
       "Vary": [
         "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
         "Accept-Encoding"
       ],
-      "ETag": "W/\"cf6199fecf47b59c42190e1e11147ee2\"",
-      "Last-Modified": "Tue, 24 Sep 2019 19:32:29 GMT",
+      "ETag": "W/\"258532ccc5159b9edb18d753828d7995\"",
+      "Last-Modified": "Mon, 03 Aug 2020 18:04:21 GMT",
       "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
       "X-Accepted-OAuth-Scopes": "",
       "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
       "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
       "X-Frame-Options": "deny",
       "X-Content-Type-Options": "nosniff",
       "X-XSS-Protection": "1; mode=block",
       "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
       "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CAF1:9576:6B11BA:80379D:5D9665B2"
+      "X-GitHub-Request-Id": "D640:8464:9DD872:C076C5:5F34942A"
     }
   },
-  "uuid": "d246cfb6-e28a-417b-8d74-29080bbc1c4c",
+  "uuid": "5b73bc57-8168-4296-853a-61ed0eab5a01",
   "persistent": true,
   "insertionIndex": 1
 }
\ No newline at end of file