diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index 1a54fa6e86..b64fe0e69f 100644
--- a/routers/web/org/setting.go
+++ b/routers/web/org/setting.go
@@ -40,6 +40,8 @@ const (
 	tplSettingsLabels base.TplName = "org/settings/labels"
 	// tplSettingsRunners template path for render runners settings
 	tplSettingsRunners base.TplName = "org/settings/runners"
+	// tplSettingsSecrets template path for render secrets settings
+	tplSettingsSecrets base.TplName = "org/settings/secrets"
 )
 
 // Settings render the main settings page
@@ -249,3 +251,12 @@ func Labels(ctx *context.Context) {
 	ctx.Data["LabelTemplates"] = repo_module.LabelTemplates
 	ctx.HTML(http.StatusOK, tplSettingsLabels)
 }
+
+// Secrets render organization secrets page
+func Secrets(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("repo.secrets")
+	ctx.Data["PageIsOrgSettings"] = true
+	ctx.Data["PageIsOrgSettingsSecrets"] = true
+	ctx.Data["RequireTribute"] = true
+	ctx.HTML(http.StatusOK, tplSettingsSecrets)
+}
diff --git a/routers/web/web.go b/routers/web/web.go
index 3c8bcbe724..c0eb5f05b2 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -791,6 +791,10 @@ func RegisterRoutes(m *web.Route) {
 					m.Post("/initialize", bindIgnErr(forms.InitializeLabelsForm{}), org.InitializeLabels)
 				})
 
+				m.Group("/secrets", func() {
+					m.Get("", org.Secrets)
+				})
+
 				m.Group("/runners", func() {
 					m.Get("", org.Runners)
 					m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken)
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
index 8f21762175..1d236a3d89 100644
--- a/templates/org/settings/navbar.tmpl
+++ b/templates/org/settings/navbar.tmpl
@@ -25,6 +25,9 @@
 		<a class="{{if .PageIsOrgSettingsRunners}}active{{end}} item" href="{{.OrgLink}}/settings/runners">
 			{{.locale.Tr "repo.runners"}}
 		</a>
+		<a class="{{if .PageIsOrgSettingsSecrets}}active{{end}} item" href="{{.OrgLink}}/settings/secrets">
+			{{.locale.Tr "repo.secrets"}}
+		</a>
 		<a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{.OrgLink}}/settings/delete">
 			{{.locale.Tr "org.settings.delete"}}
 		</a>
diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl
new file mode 100644
index 0000000000..4657a9b296
--- /dev/null
+++ b/templates/org/settings/secrets.tmpl
@@ -0,0 +1,79 @@
+{{template "base/head" .}}
+<div class="page-content organization settings webhooks">
+	{{template "org/header" .}}
+	<div class="ui container">
+		<div class="ui grid">
+			{{template "org/settings/navbar" .}}
+			<div class="ui twelve wide column content">
+					{{template "base/alert" .}}
+					<h4 class="ui top attached header">
+						{{.locale.Tr "repo.settings.secrets"}}
+						<div class="ui right">
+							<div class="ui primary tiny show-panel button" data-panel="#add-secret-panel">{{.locale.Tr "repo.settings.add_secret"}}</div>
+						</div>
+					</h4>
+					<div class="ui attached segment">
+						<div class="{{if not .HasError}}hide{{end}} mb-4" id="add-secret-panel">
+							<form class="ui form" action="{{.Link}}?act=secret" method="post">
+								{{.CsrfTokenHtml}}
+								<div class="field">
+									{{.locale.Tr "repo.settings.secret_desc"}}
+								</div>
+								<div class="field {{if .Err_Title}}error{{end}}">
+									<label for="title">{{.locale.Tr "repo.settings.secret_key"}}</label>
+									<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
+								</div>
+								<div class="field {{if .Err_Content}}error{{end}}">
+									<label for="content">{{.locale.Tr "repo.settings.secret_content"}}</label>
+									<textarea id="ssh-key-content" name="content" placeholder="{{.locale.Tr "settings.secret_value_content_placeholder"}}" required>{{.content}}</textarea>
+								</div>
+								<div class="field">
+									<div class="ui checkbox {{if .Err_IsWritable}}error{{end}}">
+										<input id="pull_request_read" name="pull_request_read" class="hidden" type="checkbox" value="1">
+										<label for="is_writable">
+											{{.locale.Tr "repo.settings.pull_request_read"}}
+										</label>
+										<small style="padding-left: 26px;">{{$.locale.Tr "repo.settings.pull_request_read_info" | Str2html}}</small>
+									</div>
+								</div>
+								<button class="ui green button">
+									{{.locale.Tr "repo.settings.add_secret"}}
+								</button>
+								<button class="ui hide-panel button" data-panel="#add-secret-panel">
+									{{.locale.Tr "cancel"}}
+								</button>
+							</form>
+						</div>
+						{{if .Secrets}}
+							<div class="ui key list">
+								{{range .Secrets}}
+									<div class="item">
+										<div class="right floated content">
+											<button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete?act=secret" data-id="{{.ID}}">
+												{{$.locale.Tr "settings.delete_key"}}
+											</button>
+										</div>
+										<div class="left floated content">
+											<i class="tooltip">{{svg "octicon-key" 32}}</i>
+										</div>
+										<div class="content">
+											<strong>{{.Name}}</strong>
+											<div class="print meta">
+												{{Shadow .Data}}
+											</div>
+											<div class="activity meta">
+												<i>{{$.locale.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> —  {{svg "octicon-info"}} - <span>{{if .PullRequest}} {{$.locale.Tr "repo.settings.pull_request_read_info"}} {{end}}</span></i>
+											</div>
+										</div>
+									</div>
+								{{end}}
+							</div>
+						{{else}}
+							{{.locale.Tr "repo.settings.no_secret"}}
+						{{end}}
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl
index 6239b04ed4..5cd1d86f78 100644
--- a/templates/repo/settings/nav.tmpl
+++ b/templates/repo/settings/nav.tmpl
@@ -12,7 +12,7 @@
 			{{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}}
 				<li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.locale.Tr "repo.settings.githooks"}}</a></li>
 			{{end}}
-			<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.deploy_keys"}}</a></li>
+			<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.secrets"}}</a></li>
 		</ul>
 	</div>
 </div>
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 82ae250df1..522e35d230 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -25,7 +25,7 @@
 			</a>
 		{{end}}
 		<a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys">
-			{{.locale.Tr "repo.settings.deploy_keys"}}
+			{{.locale.Tr "repo.settings.secrets"}}
 		</a>
 		{{if .LFSStartServer}}
 			<a class="{{if .PageIsSettingsLFS}}active{{end}} item" href="{{.RepoLink}}/settings/lfs">