diff --git a/modules/openapi-generator/src/main/resources/r/r-client.mustache b/modules/openapi-generator/src/main/resources/r/r-client.mustache
index 567ce17f2fb..b9d883ec4c9 100644
--- a/modules/openapi-generator/src/main/resources/r/r-client.mustache
+++ b/modules/openapi-generator/src/main/resources/r/r-client.mustache
@@ -23,4 +23,11 @@ jobs:
         with:
           extra-packages: any::rcmdcheck
           needs: check
+      - name: Install roxygen2
+        run: install.packages("roxygen2")
+        shell: Rscript {0}
+      - name: Roxygenize
+        run: |
+          roxygen2::roxygenize('.', roclets = c('rd', 'collate', 'namespace'))
+        shell: Rscript {0}
       - uses: r-lib/actions/check-r-package@v2
diff --git a/samples/client/petstore/R/.github/workflows/r-client.yaml b/samples/client/petstore/R/.github/workflows/r-client.yaml
index 567ce17f2fb..b9d883ec4c9 100644
--- a/samples/client/petstore/R/.github/workflows/r-client.yaml
+++ b/samples/client/petstore/R/.github/workflows/r-client.yaml
@@ -23,4 +23,11 @@ jobs:
         with:
           extra-packages: any::rcmdcheck
           needs: check
+      - name: Install roxygen2
+        run: install.packages("roxygen2")
+        shell: Rscript {0}
+      - name: Roxygenize
+        run: |
+          roxygen2::roxygenize('.', roclets = c('rd', 'collate', 'namespace'))
+        shell: Rscript {0}
       - uses: r-lib/actions/check-r-package@v2