diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index d027f37..cf4a0ab 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
           context: . # UTILISE LE CONTEXTE LOCAL, PAS L'URL GIT
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
-            harbor.bv.stef.lan/library/pki-manager:${{env.GITHUB_SHA}}
+            harbor.bv.stef.lan/library/pki-manager:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
           provenance: false # Peut simplifier le débogage initialement
diff --git a/internal/models/ca.go b/internal/models/ca.go
index c2ed7c3..ab14464 100644
--- a/internal/models/ca.go
+++ b/internal/models/ca.go
@@ -9,6 +9,7 @@ type CA struct {
 	Name         string    `json:"name" bson:"name"`
 	CommonName   string    `json:"common_name" bson:"common_name"`
 	Organization string    `json:"organization" bson:"organization"`
+	OrganizationalUnit string `json:"organization_unit" bson:"organization_unit"`
 	Country      string    `json:"country" bson:"country"`
 	Province     string    `json:"province" bson:"province"`
 	Locality     string    `json:"locality" bson:"locality"`
@@ -27,6 +28,7 @@ type CreateCARequest struct {
 	Name         string `json:"name" binding:"required"`
 	CommonName   string `json:"common_name" binding:"required"`
 	Organization string `json:"organization" binding:"required"`
+	OrganizationalUnit string `json:"organization_unit" binding:"required"`
 	Country      string `json:"country" binding:"required"`
 	Province     string `json:"province"`
 	Locality     string `json:"locality"`
@@ -39,5 +41,6 @@ type CreateCARequest struct {
 type UpdateCARequest struct {
 	Name         string `json:"name"`
 	Organization string `json:"organization"`
+	OrganizationalUnit string `json:"organization_unit"`
 	Email        string `json:"email"`
 }
diff --git a/internal/models/subca.go b/internal/models/subca.go
index 498d548..076df6b 100644
--- a/internal/models/subca.go
+++ b/internal/models/subca.go
@@ -9,6 +9,7 @@ type SubCA struct {
 	Name         string    `json:"name" bson:"name"`
 	CommonName   string    `json:"common_name" bson:"common_name"`
 	Organization string    `json:"organization" bson:"organization"`
+	OrganizationalUnit string `json:"organization_unit" bson:"organization_unit"`
 	Country      string    `json:"country" bson:"country"`
 	Province     string    `json:"province" bson:"province"`
 	Locality     string    `json:"locality" bson:"locality"`
@@ -27,6 +28,7 @@ type CreateSubCARequest struct {
 	Name         string `json:"name" binding:"required"`
 	CommonName   string `json:"common_name" binding:"required"`
 	Organization string `json:"organization" binding:"required"`
+	OrganizationalUnit string `json:"organization_unit" binding:"required"`
 	Country      string `json:"country" binding:"required"`
 	Province     string `json:"province"`
 	Locality     string `json:"locality"`
@@ -39,5 +41,6 @@ type CreateSubCARequest struct {
 type UpdateSubCARequest struct {
 	Name         string `json:"name"`
 	Organization string `json:"organization"`
+	OrganizationalUnit string `json:"organization_unit"`
 	Email        string `json:"email"`
 }
diff --git a/internal/services/crypto_service.go b/internal/services/crypto_service.go
index 8c79324..8f77c5c 100644
--- a/internal/services/crypto_service.go
+++ b/internal/services/crypto_service.go
@@ -38,6 +38,7 @@ func (s *CryptoService) GenerateRootCA(req models.CreateCARequest) (*models.CA,
 	subject := pkix.Name{
 		CommonName:   req.CommonName,
 		Organization: []string{req.Organization},
+		OrganizationalUnit []string{req.OrganizationalUnit},
 		Country:      []string{req.Country},
 		Province:     []string{req.Province},
 		Locality:     []string{req.Locality},
@@ -88,6 +89,7 @@ func (s *CryptoService) GenerateRootCA(req models.CreateCARequest) (*models.CA,
 		Name:         req.Name,
 		CommonName:   req.CommonName,
 		Organization: req.Organization,
+		OrganizationalUnit: req.OrganizationalUnit,
 		Country:      req.Country,
 		Province:     req.Province,
 		Locality:     req.Locality,
@@ -137,6 +139,7 @@ func (s *CryptoService) GenerateSubCA(req models.CreateSubCARequest, parentCA *m
 	subject := pkix.Name{
 		CommonName:   req.CommonName,
 		Organization: []string{req.Organization},
+		OrganizationalUnit []string{req.OrganizationalUnit},
 		Country:      []string{req.Country},
 		Province:     []string{req.Province},
 		Locality:     []string{req.Locality},
@@ -177,6 +180,7 @@ func (s *CryptoService) GenerateSubCA(req models.CreateSubCARequest, parentCA *m
 		Name:         req.Name,
 		CommonName:   req.CommonName,
 		Organization: req.Organization,
+		OrganizationalUnit: req.OrganizationalUnit,
 		Country:      req.Country,
 		Province:     req.Province,
 		Locality:     req.Locality,
diff --git a/internal/web/templates/index.html b/internal/web/templates/index.html
index af579d1..d5115df 100644
--- a/internal/web/templates/index.html
+++ b/internal/web/templates/index.html
@@ -120,6 +120,10 @@
                     <label for="caOrganization">Organization</label>
                     <input type="text" id="caOrganization" name="organization" required>
                 </div>
+                <div class="form-group">
+                    <label for="caOrganization_unit">Organizational Unit</label>
+                    <input type="text" id="caOrganization_unit" name="organization_unit" required>
+                </div>
                 <div class="form-group">
                     <label for="caCountry">Country (2 letters)</label>
                     <input type="text" id="caCountry" name="country" maxlength="2" required>
@@ -178,6 +182,10 @@
                     <label for="subcaOrganization">Organization</label>
                     <input type="text" id="subcaOrganization" name="organization" required>
                 </div>
+                <div class="form-group">
+                    <label for="subcaOrganization_unit">Organizational Unit</label>
+                    <input type="text" id="subcaOrganization_unit" name="organization_unit" required>
+                </div>
                 <div class="form-group">
                 <label for="subcaEmail">Email (optional)</label>
                 <input type="email" id="subcaEmail" name="email" placeholder="Optional email address">